Rebased ref, commits from common ancestor:
commit afffb0db08447dd6dad74fafb9ffac09b1a74f18
Author: Kohei Yoshida <kohei.yosh...@gmail.com>
Date: Sat Apr 13 00:41:13 2013 -0400
Handle hidden property for external filter loading as well.
Change-Id: I7a0154161d28e59c3e741fd592d3ce175676c901
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index fee8ea7..9024cd0 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -1823,6 +1823,16 @@ OUString getFilterProvider( SfxMedium& rMedium )
return pFilter->GetProviderName();
}
+void setUpdatePickList( SfxMedium* pMedium )
+{
+ bool bHidden = false;
+ SFX_ITEMSET_ARG(pMedium->GetItemSet(), pHidItem, SfxBoolItem, SID_HIDDEN,
false);
+ if (pHidItem)
+ bHidden = pHidItem->GetValue();
+
+ pMedium->SetUpdatePickList(!bHidden);
+}
+
}
void SAL_CALL SfxBaseModel::load( const Sequence< beans::PropertyValue >&
seqArguments )
@@ -1855,7 +1865,7 @@ void SAL_CALL SfxBaseModel::load( const Sequence<
beans::PropertyValue >& seqA
nError = ERRCODE_IO_GENERAL;
handleLoadError(nError, pMedium);
- pMedium->SetUpdatePickList(false);
+ setUpdatePickList(pMedium);
return;
}
@@ -1943,20 +1953,13 @@ void SAL_CALL SfxBaseModel::load( const Sequence<
beans::PropertyValue >& seqA
m_pData->m_pObjectShell->ResetError();
handleLoadError(nError, pMedium);
-
- loadCmisProperties( );
-
- sal_Bool bHidden = sal_False;
- SFX_ITEMSET_ARG( pMedium->GetItemSet(), pHidItem, SfxBoolItem, SID_HIDDEN,
sal_False);
- if ( pHidItem )
- bHidden = pHidItem->GetValue();
+ loadCmisProperties();
+ setUpdatePickList(pMedium);
#if OSL_DEBUG_LEVEL > 0
SFX_ITEMSET_ARG( pMedium->GetItemSet(), pPasswdItem, SfxStringItem,
SID_PASSWORD, sal_False);
OSL_ENSURE( !pPasswdItem, "There should be no Password property in the
document MediaDescriptor!" );
#endif
- // !TODO: will be done by Framework!
- pMedium->SetUpdatePickList( !bHidden );
}
//________________________________________________________________________________________________________
commit ee5aae17e45e52a4e4c9f023d977aad1c15bc95f
Author: Kohei Yoshida <kohei.yosh...@gmail.com>
Date: Fri Apr 12 23:36:53 2013 -0400
Get cppunit in sc to link with orcus-parser.
Change-Id: I1f53a4f4b9beee501e29149ed88e3ce5d63d9a3c
diff --git a/download.lst b/download.lst
index b8948f4..90aa6e5 100644
--- a/download.lst
+++ b/download.lst
@@ -68,7 +68,7 @@ export NEON_TARBALL :=
ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
export NSS_TARBALL :=
a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
export OPENSSL_TARBALL :=
51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz
-export ORCUS_TARBALL := 5c4201c038183b2e9b69d317784b2245-liborcus-0.5.1.tar.bz2
+export ORCUS_TARBALL := ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2
export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
export PNG_TARBALL := 9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz
export POSTGRESQL_TARBALL :=
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
diff --git a/liborcus/ExternalProject_liborcus.mk
b/liborcus/ExternalProject_liborcus.mk
index f70a377..daded4d 100644
--- a/liborcus/ExternalProject_liborcus.mk
+++ b/liborcus/ExternalProject_liborcus.mk
@@ -64,6 +64,8 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
$(call gb_ExternalProject_run,build,\
$(if $(filter ANDROID,$(OS)),LIBS='-lgnustl_shared -lm') \
$(if $(filter YES,$(SYSTEM_ZLIB)),LIBS+=-lz) \
+ $(if $(filter MSC,$(COM)),CPPFLAGS+="-DBOOST_ALL_NO_LIB") \
+ $(if $(filter MSC,$(COM)),CXXFLAGS+=$(BOOST_CXXFLAGS)) \
$(if $(filter
NO,$(SYSTEM_ZLIB)),CPPFLAGS+=-I$(OUTDIR)/inc/external/zlib) \
$(if $(filter
NO,$(SYSTEM_BOOST)),CXXFLAGS+=-I$(WORKDIR)/UnpackedTarball/boost) \
$(if $(filter YES,$(SYSTEM_BOOST)),LDFLAGS=$(BOOST_LDFLAGS)) \
diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index 9558691..0599771 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -30,6 +30,7 @@
#define SC_QA_HELPER_HXX
#include <test/bootstrapfixture.hxx>
+#define __ORCUS_STATIC_LIB
#include "helper/csv_handler.hxx"
#include "helper/debughelper.hxx"
#include "orcus/csv_parser.hpp"
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
