[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/ExternalLib.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b8cab27008e54a643ba692f97384087ff9e65574 Author: David Tardon Date: Mon Oct 3 08:55:41 2011 +0200 set --build and --host for cross-compilation diff --git a/solenv/gbuild/ExternalLib.mk b/solenv/gbuild/ExternalLib.mk index 5fe8876..7a60a3b 100644 --- a/solenv/gbuild/ExternalLib.mk +++ b/solenv/gbuild/ExternalLib.mk @@ -103,7 +103,7 @@ define gb_ExternalLib__command_autotools mkdir -p $(call gb_ExternalLib_get_builddir,$(1)) && \ tar -x -C $(call gb_ExternalLib_get_builddir,$(1)) --strip-component=1 -f $< && \ cd $(call gb_ExternalLib_get_builddir,$(1)) && for p in $(T_PATCHES) ; do patch -p 1 < $(gb_REPOS)/$$p || exit 1; done && \ - CC="$(gb_CC)" CXX="$(gb_CXX)" CFLAGS="$(T_CFLAGS)" CXXFLAGS="$(T_CXXFLAGS)" PKG_CONFIG_PATH="$(PKG_CONFIG_PATH) $(OUTDIR)/lib/pkgconfig" ./configure --prefix=$(OUTDIR) $(T_CONF_ARGS) && \ + CC="$(gb_CC)" CXX="$(gb_CXX)" CFLAGS="$(T_CFLAGS)" CXXFLAGS="$(T_CXXFLAGS)" PKG_CONFIG_PATH="$(PKG_CONFIG_PATH) $(OUTDIR)/lib/pkgconfig" ./configure $(if $(findstring YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) --prefix=$(OUTDIR) $(T_CONF_ARGS) && \ for p in $(T_POST_PATCHES) ; do patch -p 1 < $(gb_REPOS)/$p || exit 1; done #we don't want a deployed rpath pointing into our solver, to-do, set correct ORIGIN-foo ? cd $(call gb_ExternalLib_get_builddir,$(1)) && if test -e libtool ; then sed -i 's,^hardcode_libdir_flag_spec=.*,hardcode_libdir_flag_spec="",g' libtool && sed -i 's,^runpath_var=LD_RUN_PATH,runpath_var=DIE_RPATH_DIE,g' libtool; fi ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/filter/xml/xmlitem.cxx |5 +
1 file changed, 1 insertion(+), 4 deletions(-)
New commits:
commit adb74e59693998ce217de243573b1f13caea9b29
Author: Tor Lillqvist
Date: Fri Sep 30 10:19:05 2011 +0300
WaE: control reaches end of non-void function
diff --git a/sw/source/filter/xml/xmlitem.cxx b/sw/source/filter/xml/xmlitem.cxx
index fd0a128..ccf2f2a 100644
--- a/sw/source/filter/xml/xmlitem.cxx
+++ b/sw/source/filter/xml/xmlitem.cxx
@@ -66,10 +66,7 @@ SvXMLImportContext *SvXMLItemSetContext::CreateChildContext(
sal_uInt16 nPrefix,
return CreateChildContext( nPrefix, rLocalName, xAttrList,
rItemSet, *pEntry, rUnitConv );
}
-else
-{
-return new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
-}
+return new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
}
/** This method is called from this instance implementation of
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/inc
solenv/inc/libs.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit df69a3839a0dcf12a81a4e4e4dc58b2a47c7c85c Author: David Tardon Date: Mon Oct 3 08:07:12 2011 +0200 fix build of CMIS UCP diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 1009c6f..3d1e09b 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -248,7 +248,7 @@ REDLANDLIB=$(REDLAND_LIBS) .ELSE REDLANDLIB=-lrdf .ENDIF -.IF "$(SYSTEM_LIBCMIS)" +.IF "$(SYSTEM_LIBCMIS)"=="YES" CMISLIB=$(LIBCMIS_LIBS) .ELSE CMISLIB=-lcmis-0.2 ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - solenv/gbuild
solenv/gbuild/ExternalLib.mk | 12 +--- 1 file changed, 9 insertions(+), 3 deletions(-) New commits: commit a4bc0fa8e7da969adeb15f2a782452570ad2bf5a Author: David Tardon Date: Mon Oct 3 07:02:22 2011 +0200 do not escape calls if not needed diff --git a/solenv/gbuild/ExternalLib.mk b/solenv/gbuild/ExternalLib.mk index 36c3697..5fe8876 100644 --- a/solenv/gbuild/ExternalLib.mk +++ b/solenv/gbuild/ExternalLib.mk @@ -47,8 +47,8 @@ $(call gb_ExternalLib_get_target,$(1)) : $(call gb_ExternalLib_get_clean_target,$(1)) : $$(call gb_Output_announce,$(1),$(false),MAK,3) $$(call gb_Helper_abbreviate_dirs,\ - if test -f $$(call gb_ExternalLib_get_builddir,$(1))/Makefile ; then cd $$(call gb_ExternalLib_get_builddir,$(1)) && make uninstall ; fi ; \ - rm -rf $$(call gb_ExternalLib_get_target,$(1)) \ + if test -f $(call gb_ExternalLib_get_builddir,$(1))/Makefile ; then cd $$(call gb_ExternalLib_get_builddir,$(1)) && make uninstall ; fi ; \ + rm -rf $(call gb_ExternalLib_get_target,$(1)) \ $(call gb_ExternalLib_get_workdir,$(1))) else commit 26eae8c557f14be99f6559e9027d4562694d10e1 Author: David Tardon Date: Mon Oct 3 06:58:21 2011 +0200 we do not really need two rm calls here diff --git a/solenv/gbuild/ExternalLib.mk b/solenv/gbuild/ExternalLib.mk index fad1316..36c3697 100644 --- a/solenv/gbuild/ExternalLib.mk +++ b/solenv/gbuild/ExternalLib.mk @@ -48,8 +48,8 @@ $(call gb_ExternalLib_get_clean_target,$(1)) : $$(call gb_Output_announce,$(1),$(false),MAK,3) $$(call gb_Helper_abbreviate_dirs,\ if test -f $$(call gb_ExternalLib_get_builddir,$(1))/Makefile ; then cd $$(call gb_ExternalLib_get_builddir,$(1)) && make uninstall ; fi ; \ - rm -f $$(call gb_ExternalLib_get_target,$(1)) ; \ - rm -rf $(call gb_ExternalLib_get_workdir,$(1))) + rm -rf $$(call gb_ExternalLib_get_target,$(1)) \ + $(call gb_ExternalLib_get_workdir,$(1))) else $$(call gb_Output_error,$(2) is not a supported ExternalLib mode) commit d793da55d38ed3f0ff91bd581653e9ec8795f361 Author: David Tardon Date: Mon Oct 3 06:54:24 2011 +0200 add newlines to avoid possible problems with joined lines diff --git a/solenv/gbuild/ExternalLib.mk b/solenv/gbuild/ExternalLib.mk index f25e79f..fad1316 100644 --- a/solenv/gbuild/ExternalLib.mk +++ b/solenv/gbuild/ExternalLib.mk @@ -59,6 +59,7 @@ endef define gb_ExternalLib_set_src_package $(call gb_ExternalLib_get_target,$(1)): $(call gb_ExternalLib_get_src_package,$(2)) + endef define gb_ExternalLib_add_patch @@ -68,6 +69,7 @@ endef define gb_ExternalLib_add_patches $(foreach patch,$(2),$(call gb_ExternalLib_add_patch,$(1),$(patch))) + endef define gb_ExternalLib_add_post_patch @@ -77,18 +79,22 @@ endef define gb_ExternalLib_add_post_patches $(foreach patch,$(2),$(call gb_ExternalLib_add_patch,$(1),$(patch))) + endef define gb_ExternalLib_add_conf_arg $(call gb_ExternalLib_get_target,$(1)): T_CONF_ARGS+=$(2) + endef define gb_ExternalLib_add_cxxflags $(call gb_ExternalLib_get_target,$(1)) : T_CXXFLAGS += $(2) + endef define gb_ExternalLib_add_cflags $(call gb_ExternalLib_get_target,$(1)) : T_CFLAGS += $(2) + endef ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 5 commits - framework/inc framework/source hwpfilter/source lotuswordpro/source sdext/source sfx2/inc sfx2/source svl/inc svl/source unusedcode.easy
framework/inc/framework/statusbarconfiguration.hxx| 17 --
framework/source/fwe/xml/statusbarconfiguration.cxx |2
hwpfilter/source/hwpfile.cxx | 22 +--
lotuswordpro/source/filter/localtime.cxx |1
lotuswordpro/source/filter/lwpframelayout.cxx | 43 ++
lotuswordpro/source/filter/lwpgrfobj.cxx |7 -
lotuswordpro/source/filter/lwpobjstrm.cxx |7 -
lotuswordpro/source/filter/lwppara1.cxx |4
lotuswordpro/source/filter/xfilter/xfconfigmanager.cxx| 19 +-
lotuswordpro/source/filter/xfilter/xfconfigmanager.hxx|1
lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx |3
sdext/source/minimizer/description.xml|2
sdext/source/pdfimport/config/description.xml |2
sdext/source/presenter/description.xml|2
sfx2/inc/sfx2/tabdlg.hxx |7 -
sfx2/source/dialog/tabdlg.cxx | 95 --
svl/inc/svl/style.hxx |1
svl/source/items/style.cxx|4
unusedcode.easy |7 -
19 files changed, 50 insertions(+), 196 deletions(-)
New commits:
commit c71bb2601ac39a8529725e1da926f854ba040caf
Author: Caolán McNamara
Date: Sun Oct 2 23:18:46 2011 +0100
fix smoketest-breaking typo
diff --git a/sdext/source/minimizer/description.xml
b/sdext/source/minimizer/description.xml
index b0bc64a..f8762c7 100644
--- a/sdext/source/minimizer/description.xml
+++ b/sdext/source/minimizer/description.xml
@@ -29,6 +29,6 @@
-
+
diff --git a/sdext/source/pdfimport/config/description.xml
b/sdext/source/pdfimport/config/description.xml
index 8301167..c6c3b30 100644
--- a/sdext/source/pdfimport/config/description.xml
+++ b/sdext/source/pdfimport/config/description.xml
@@ -28,6 +28,6 @@
-
+
diff --git a/sdext/source/presenter/description.xml
b/sdext/source/presenter/description.xml
index 6435733..bf9ce72 100644
--- a/sdext/source/presenter/description.xml
+++ b/sdext/source/presenter/description.xml
@@ -29,6 +29,6 @@
-
+
commit 19a23df7f2dcdba88edd507ddd6d6201f1eeb1bc
Author: Caolán McNamara
Date: Sun Oct 2 22:43:34 2011 +0100
valgrind: fix some leaks
diff --git a/lotuswordpro/source/filter/localtime.cxx
b/lotuswordpro/source/filter/localtime.cxx
index 1eee2bf..9d25aca 100644
--- a/lotuswordpro/source/filter/localtime.cxx
+++ b/lotuswordpro/source/filter/localtime.cxx
@@ -185,6 +185,7 @@ bool LtgLocalTime(long rtime,LtTm& rtm)
{
TimeZone* pLocalZone = TimeZone::createDefault();
long offset = (pLocalZone->getRawOffset())/1000;
+delete pLocalZone;
long ltime = rtime + offset;
return LtgGmTime(ltime,rtm);
}
diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx
b/lotuswordpro/source/filter/lwpframelayout.cxx
index e1f3552..dcbe10d 100644
--- a/lotuswordpro/source/filter/lwpframelayout.cxx
+++ b/lotuswordpro/source/filter/lwpframelayout.cxx
@@ -764,16 +764,11 @@ void LwpFrameLink::Read(LwpObjectStream* pStrm)
LwpFrameLayout::LwpFrameLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
: LwpPlacableLayout(objHdr, pStrm), m_pFrame(NULL)
{
-
}
LwpFrameLayout::~LwpFrameLayout()
{
-if(m_pFrame)
-{
-delete m_pFrame;
-m_pFrame = NULL;
-}
+delete m_pFrame;
}
/**
@@ -856,10 +851,12 @@ void LwpFrameLayout::XFConvertFrame(XFContentContainer*
pCont, sal_Int32 nStart
void LwpFrameLayout::RegisterStyle()
{
//if it is for water mark, don't register style
-if(IsForWaterMark())
-{
+if (IsForWaterMark())
return;
-}
+
+if (m_pFrame)
+return;
+
//register frame style
XFFrameStyle* pFrameStyle = new XFFrameStyle();
m_pFrame = new LwpFrame(this);
@@ -875,9 +872,8 @@ void LwpFrameLayout::RegisterStyle()
//register child frame style
RegisterChildStyle();
-
-
}
+
/**
* @descr get the name of the frame that current frame links
*
@@ -1021,18 +1017,15 @@ void LwpFrameLayout::ApplyGraphicSize(XFFrame *
pXFFrame)
}
LwpGroupLayout::LwpGroupLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
-: LwpPlacableLayout(objHdr, pStrm),m_pFrame(NULL)
+: LwpPlacableLayout(objHdr, pStrm)
+, m_pFrame(NULL)
{
}
LwpGroupLayout::~LwpGroupLayout()
{
-if(m_pFrame)
-{
-delete m_pFrame;
-m_pFrame = NULL;
-}
+delete m_pFrame;
}
/**
* @descr read group layout object
@@ -1049,6 +1042,9 @@ void LwpGroupLayout::Read()
*/
void LwpGroupLayout::RegisterStyle()
{
+if (m_pFrame)
+return;
+
//register frame style
XFFrameStyle* pFrameStyle = new XFFrameStyle();
m_pFrame = new LwpFrame(this);
@@ -1056,15 +1052,6 @@ void L
[Libreoffice-commits] .: configure.in solenv/inc
configure.in |2 +- solenv/inc/libs.mk |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 4c97165615a795e1e43c6c440b1ed229caf7d63c Author: Rene Engelhard Date: Mon Oct 3 00:12:42 2011 +0200 fix some typos..., thanks matus diff --git a/configure.in b/configure.in index d04cedc..87c8627 100644 --- a/configure.in +++ b/configure.in @@ -4620,7 +4620,7 @@ dnl === AC_MSG_CHECKING([which libcmis to use]) if test -n "$with_system_libcmis" -a "$with_system_libcmis" = "yes"; then AC_MSG_RESULT([external]) -SYSTEM_LIBVISIO=YES +SYSTEM_LIBCMIS=YES PKG_CHECK_MODULES( LIBCMIS, libcmis-0.2 ) else AC_MSG_RESULT([internal]) diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 9952bcb..1009c6f 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -249,7 +249,7 @@ REDLANDLIB=$(REDLAND_LIBS) REDLANDLIB=-lrdf .ENDIF .IF "$(SYSTEM_LIBCMIS)" -CMISLIB=$(CLIBMIS_LIBS) +CMISLIB=$(LIBCMIS_LIBS) .ELSE CMISLIB=-lcmis-0.2 .ENDIF ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in set_soenv.in solenv/inc ucb/prj
configure.in | 17 + set_soenv.in |3 +++ solenv/inc/libs.mk |5 - ucb/prj/build.lst |2 +- 4 files changed, 25 insertions(+), 2 deletions(-) New commits: commit ba44f8805b238479981a9d889e7e432c0a531d42 Author: Rene Engelhard Date: Sun Oct 2 21:36:48 2011 + add --with-system-libcmis diff --git a/configure.in b/configure.in index cb7cfcc..d04cedc 100644 --- a/configure.in +++ b/configure.in @@ -4614,6 +4614,23 @@ AC_SUBST(SYSTEM_LIBVISIO) AC_SUBST(LIBVISIO_CFLAGS) AC_SUBST(LIBVISIO_LIBS) +dnl === +dnl Check for system libcmis +dnl === +AC_MSG_CHECKING([which libcmis to use]) +if test -n "$with_system_libcmis" -a "$with_system_libcmis" = "yes"; then +AC_MSG_RESULT([external]) +SYSTEM_LIBVISIO=YES +PKG_CHECK_MODULES( LIBCMIS, libcmis-0.2 ) +else +AC_MSG_RESULT([internal]) +SYSTEM_LIBCMIS=NO +BUILD_TYPE="$BUILD_TYPE LIBCMIS" +fi +AC_SUBST(SYSTEM_LIBCMIS) +AC_SUBST(LIBCMIS_CFLAGS) +AC_SUBST(LIBCMIS_LIBS) + dnl === dnl Check for system libwpd diff --git a/set_soenv.in b/set_soenv.in index 9695bef..6b4e4d1 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -1910,6 +1910,9 @@ ToFile( "LIBWPG_LIBS", "@LIBWPG_LIBS@", "e" ); ToFile( "SYSTEM_LIBVISIO", "@SYSTEM_LIBVISIO@", "e" ); ToFile( "LIBVISIO_CFLAGS", "@LIBVISIO_CFLAGS@", "e" ); ToFile( "LIBVISIO_LIBS", "@LIBVISIO_LIBS@","e" ); +ToFile( "SYSTEM_LIBCMIS","@SYSTEM_LIBCMIS@", "e" ); +ToFile( "LIBCMIS_CFLAGS","@LIBCMIS_CFLAGS@", "e" ); +ToFile( "LIBCMIS_LIBS", "@LIBCMIS_LIBS@","e" ); ToFile( "SYSTEM_CPPUNIT","@SYSTEM_CPPUNIT@", "e" ); ToFile( "CPPUNIT_CFLAGS","@CPPUNIT_CFLAGS@", "e" ); ToFile( "CPPUNIT_LIBS", "@CPPUNIT_LIBS@", "e" ); diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 1f5dc20..9952bcb 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -248,8 +248,11 @@ REDLANDLIB=$(REDLAND_LIBS) .ELSE REDLANDLIB=-lrdf .ENDIF +.IF "$(SYSTEM_LIBCMIS)" +CMISLIB=$(CLIBMIS_LIBS) +.ELSE CMISLIB=-lcmis-0.2 - +.ENDIF # #110743# # For BinFilters, some libs were added. diff --git a/ucb/prj/build.lst b/ucb/prj/build.lst index 34ea2bc..350d3f9 100644 --- a/ucb/prj/build.lst +++ b/ucb/prj/build.lst @@ -1,4 +1,4 @@ -uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 LIBXSLT:libxslt libcmis offapi sal salhelper ucbhelper udkapi comphelper tools NULL +uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 LIBXSLT:libxslt LIBCMIS:libcmis offapi sal salhelper ucbhelper udkapi comphelper tools NULL uc ucb usr1- all uc_mkout NULL uc ucb\inc nmake - all uc_inc NULL uc ucb\source\regexp nmake - all uc_regexp uc_inc NULL ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_sc
binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx | 10 +-
binfilter/bf_sc/source/ui/inc/dbdocfun.hxx | 10 +-
binfilter/bf_sc/source/ui/unoobj/sc_datauno.cxx| 16
3 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit 2a1ec70ac3eaa4000f1d8549257ed8a97a9281ef
Author: Caolán McNamara
Date: Sun Oct 2 21:59:25 2011 +0100
WaE: ditch unused args
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx
b/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx
index fc9170f..0149be6 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx
@@ -51,7 +51,7 @@
namespace binfilter {
-/*N*/ BOOL ScDBDocFunc::AddDBRange( const String& rName, const ScRange&
rRange, BOOL /*bApi*/ )
+/*N*/ BOOL ScDBDocFunc::AddDBRange( const String& rName, const ScRange& rRange
)
/*N*/ {
/*N*/
/*N*/ ScDocShellModificator aModificator( rDocShell );
@@ -78,7 +78,7 @@ namespace binfilter {
/*N*/ return TRUE;
/*N*/ }
/*N*/
-/*N*/ BOOL ScDBDocFunc::DeleteDBRange( const String& rName, BOOL /*bApi*/ )
+/*N*/ BOOL ScDBDocFunc::DeleteDBRange( const String& rName )
/*N*/ {
/*N*/ BOOL bDone = FALSE;
/*N*/ ScDocument* pDoc = rDocShell.GetDocument();
@@ -101,7 +101,7 @@ namespace binfilter {
/*N*/ return bDone;
/*N*/ }
-/*N*/ BOOL ScDBDocFunc::RenameDBRange( const String& rOld, const String& rNew,
BOOL /*bApi*/ )
+/*N*/ BOOL ScDBDocFunc::RenameDBRange( const String& rOld, const String& rNew )
/*N*/ {
/*N*/ BOOL bDone = FALSE;
/*N*/ ScDocument* pDoc = rDocShell.GetDocument();
@@ -138,7 +138,7 @@ namespace binfilter {
/*N*/ return bDone;
/*N*/ }
-/*N*/ BOOL ScDBDocFunc::ModifyDBData( const ScDBData& rNewData, BOOL /*bApi*/)
+/*N*/ BOOL ScDBDocFunc::ModifyDBData( const ScDBData& rNewData )
/*N*/ {
/*N*/ BOOL bDone = FALSE;
/*N*/ ScDocument* pDoc = rDocShell.GetDocument();
@@ -165,7 +165,7 @@ namespace binfilter {
/*N*/ }
-/*N*/ BOOL ScDBDocFunc::RepeatDB( const String& rDBName, BOOL bRecord, BOOL
bApi )
+/*N*/ BOOL ScDBDocFunc::RepeatDB( const String& rDBName, BOOL bRecord )
/*N*/ {
/*N*/ //! auch fuer ScDBFunc::RepeatDB benutzen!
/*N*/
diff --git a/binfilter/bf_sc/source/ui/inc/dbdocfun.hxx
b/binfilter/bf_sc/source/ui/inc/dbdocfun.hxx
index aa25da5..fcc6cf3 100644
--- a/binfilter/bf_sc/source/ui/inc/dbdocfun.hxx
+++ b/binfilter/bf_sc/source/ui/inc/dbdocfun.hxx
@@ -77,12 +77,12 @@ public:
const SbaSelectionList* pSelection, BOOL bRecord,
BOOL bAddrInsert = FALSE );
-BOOLAddDBRange( const String& rName, const ScRange& rRange,
BOOL bApi );
-BOOLDeleteDBRange( const String& rName, BOOL bApi );
-BOOLRenameDBRange( const String& rOld, const String& rNew,
BOOL bApi );
-BOOLModifyDBData( const ScDBData& rNewData, BOOL bApi );//
Name unveraendert
+BOOLAddDBRange( const String& rName, const ScRange& rRange );
+BOOLDeleteDBRange( const String& rName );
+BOOLRenameDBRange( const String& rOld, const String& rNew );
+BOOLModifyDBData( const ScDBData& rNewData );// Name
unveraendert
-BOOLRepeatDB( const String& rDBName, BOOL bRecord, BOOL bApi );
+BOOLRepeatDB( const String& rDBName, BOOL bRecord );
BOOLDataPilotUpdate( ScDPObject* pOldObj, const ScDPObject*
pNewObj,
BOOL bRecord, BOOL bApi );
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_datauno.cxx
b/binfilter/bf_sc/source/ui/unoobj/sc_datauno.cxx
index 87cbc63..e50161f 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_datauno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_datauno.cxx
@@ -1439,7 +1439,7 @@ void SAL_CALL ScDatabaseRangeObj::setName( const
::rtl::OUString& aNewName )
{
ScDBDocFunc aFunc(*pDocShell);
String aNewStr = aNewName;
-BOOL bOk = aFunc.RenameDBRange( aName, aNewStr, TRUE );
+BOOL bOk = aFunc.RenameDBRange( aName, aNewStr );
if (bOk)
aName = aNewStr;
}
@@ -1477,7 +1477,7 @@ void SAL_CALL ScDatabaseRangeObj::setDataArea( const
table::CellRangeAddress& aD
aNewData.SetArea( aDataArea.Sheet, (USHORT)aDataArea.StartColumn,
(USHORT)aDataArea.StartRow,
(USHORT)aDataArea.EndColumn,
(USHORT)aDataArea.EndRow );
ScDBDocFunc aFunc(*pDocShell);
-aFunc.ModifyDBData(aNewData, TRUE);
+aFunc.ModifyDBData(aNewData);
}
}
@@ -1549,7 +1549,7 @@ void ScDatabaseRangeObj::SetQueryParam(const
ScQueryParam& rQueryParam)
aNewData.SetQueryParam(aParam);
aNewData.SetHeader(aParam.bHasHeader); // not in
ScDBData::SetQueryParam
ScDBDocFunc aFunc(*pDocShell);
-aFunc.ModifyDBData(aNewData, TRUE);
+aFunc.ModifyDBData(aNewData);
}
}
[Libreoffice-commits] .: svx/prj
svx/prj/d.lst |5 - 1 file changed, 5 deletions(-) New commits: commit a1f710e799e5faac14234d971481a94f35316837 Author: Matúš Kukan Date: Sun Oct 2 19:26:30 2011 +0200 d.lst should be empty in gbuildized modules diff --git a/svx/prj/d.lst b/svx/prj/d.lst index d058ed4..e69de29 100644 --- a/svx/prj/d.lst +++ b/svx/prj/d.lst @@ -1,5 +0,0 @@ -..\inc\svx\linkwarn.hxx %_DEST%\inc\svx\linkwarn.hxx -..\inc\svx\borderline.hxx %_DEST%\inc\svx\borderline.hxx -..\inc\svx\boxitem.hxx %_DEST%\inc\svx\boxitem.hxx -..\inc\svx\brkitem.hxx %_DEST%\inc\svx\brkitem.hxx -..\inc\svx\brshitem.hxx %_DEST%\inc\svx\brshitem.hxx ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svtools/source sw/source tools/source
svtools/source/filter/filter.cxx |3 ---
sw/source/core/docnode/ndsect.cxx |4
sw/source/core/docnode/node.cxx |8
sw/source/core/table/swtable.cxx | 10 --
tools/source/stream/strmunx.cxx |4 ++--
5 files changed, 2 insertions(+), 27 deletions(-)
New commits:
commit 6612ea7d9b03dc9cec1c98fdff0e1a22d2aab241
Author: Takeshi Abe
Date: Mon Oct 3 01:46:06 2011 +0900
definition of ALPHA is no longer available for DEC Alpha
proper ifdef for DEC Alpha should be covered with AXP
diff --git a/svtools/source/filter/filter.cxx b/svtools/source/filter/filter.cxx
index 72fc266..5c9edab 100644
--- a/svtools/source/filter/filter.cxx
+++ b/svtools/source/filter/filter.cxx
@@ -29,9 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svtools.hxx"
-#if defined UNX && defined ALPHA
-#include
-#endif
#include
#include
#include
diff --git a/sw/source/core/docnode/ndsect.cxx
b/sw/source/core/docnode/ndsect.cxx
index aa5d5ec..51538f6 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -990,11 +990,7 @@ SwSectionNode* SwNode::FindSectionNode()
return GetSectionNode();
SwStartNode* pTmp = pStartOfSection;
while( !pTmp->IsSectionNode() && pTmp->GetIndex() )
-#if defined( ALPHA ) && defined( UNX )
-pTmp = ((SwNode*)pTmp)->pStartOfSection;
-#else
pTmp = pTmp->pStartOfSection;
-#endif
return pTmp->GetSectionNode();
}
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index b1bb096..ad3c4a3 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -400,11 +400,7 @@ SwTableNode* SwNode::FindTableNode()
return GetTableNode();
SwStartNode* pTmp = pStartOfSection;
while( !pTmp->IsTableNode() && pTmp->GetIndex() )
-#if defined( ALPHA ) && defined( UNX )
-pTmp = ((SwNode*)pTmp)->pStartOfSection;
-#else
pTmp = pTmp->pStartOfSection;
-#endif
return pTmp->GetTableNode();
}
@@ -803,11 +799,7 @@ SwStartNode* SwNode::FindSttNodeByType( SwStartNodeType
eTyp )
SwStartNode* pTmp = IsStartNode() ? (SwStartNode*)this : pStartOfSection;
while( eTyp != pTmp->GetStartNodeType() && pTmp->GetIndex() )
-#if defined( ALPHA ) && defined( UNX )
-pTmp = ((SwNode*)pTmp)->pStartOfSection;
-#else
pTmp = pTmp->pStartOfSection;
-#endif
return eTyp == pTmp->GetStartNodeType() ? pTmp : 0;
}
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 524ebcb..1f456e7 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -595,12 +595,6 @@ void lcl_ProcessLineGet( const SwTableLine *pLine,
SwTabCols &rToFill,
}
}
-// MS: Sonst Absturz auf der DEC-Kiste
-//
-#if defined(ALPHA) && defined(WNT)
-#pragma optimize("", off)
-#endif
-
void SwTable::GetTabCols( SwTabCols &rToFill, const SwTableBox *pStart,
sal_Bool bRefreshHidden, sal_Bool bCurRowOnly ) const
{
@@ -691,10 +685,6 @@ void SwTable::GetTabCols( SwTabCols &rToFill, const
SwTableBox *pStart,
}
}
-#if defined(ALPHA) && defined(WNT)
-#pragma optimize("", on)
-#endif
-
/*
|*
|* SwTable::SetTabCols()
diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index 110d2d1..2dfe2bb 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -228,7 +228,7 @@ static sal_uInt32 GetSvError( int nErrno )
{ 0,SVSTREAM_OK },
{ EACCES, SVSTREAM_ACCESS_DENIED },
{ EBADF,SVSTREAM_INVALID_HANDLE },
-#if defined(RS6000) || defined(ALPHA) || defined(NETBSD) || \
+#if defined(RS6000) || defined(NETBSD) || \
defined(FREEBSD) || defined(MACOSX) || defined(OPENBSD) || \
defined(__FreeBSD_kernel__) || defined (AIX) || defined(DRAGONFLY) || \
defined(IOS)
@@ -245,7 +245,7 @@ static sal_uInt32 GetSvError( int nErrno )
{ EAGAIN, SVSTREAM_LOCKING_VIOLATION },
{ EISDIR, SVSTREAM_PATH_NOT_FOUND },
{ ELOOP,SVSTREAM_PATH_NOT_FOUND },
-#if !defined(RS6000) && !defined(ALPHA) && !defined(NETBSD) && !defined
(FREEBSD) && \
+#if !defined(RS6000) && !defined(NETBSD) && !defined (FREEBSD) && \
!defined(MACOSX) && !defined(OPENBSD) && !defined(__FreeBSD_kernel__) && \
!defined(DRAGONFLY)
{ EMULTIHOP,SVSTREAM_PATH_NOT_FOUND },
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_sc binfilter/inc
binfilter/bf_sc/source/core/data/sc_documen5.cxx |2 -
binfilter/bf_sc/source/core/data/sc_document.cxx |6 ---
binfilter/bf_sc/source/core/tool/sc_chartlis.cxx | 45 ---
binfilter/inc/bf_sc/chartlis.hxx | 14 +--
4 files changed, 2 insertions(+), 65 deletions(-)
New commits:
commit 7cb861abf2f817eefd5ca4435639182fe477a095
Author: Joseph Powers
Date: Sun Oct 2 08:37:05 2011 -0700
Cleanup class ScChartListenerCollection
diff --git a/binfilter/bf_sc/source/core/data/sc_documen5.cxx
b/binfilter/bf_sc/source/core/data/sc_documen5.cxx
index 2230ac5..4bda4a3 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen5.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen5.cxx
@@ -163,8 +163,6 @@ void ScDocument::UpdateChartArea( const String& rChartName,
aArray.SetRangeList( rNewList );
aArray.SetHeaders( bColHeaders, bRowHeaders );
}
-pChartListenerCollection->ChangeListening(
-rChartName, aArray.GetRangeList() );
SchMemChart* pMemChart = aArray.CreateMemChart();
ScChartArray::CopySettings( *pMemChart, *pChartData );
diff --git a/binfilter/bf_sc/source/core/data/sc_document.cxx
b/binfilter/bf_sc/source/core/data/sc_document.cxx
index 26643cd..f2d43b7 100644
--- a/binfilter/bf_sc/source/core/data/sc_document.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_document.cxx
@@ -283,9 +283,6 @@ namespace binfilter {
/*N*/ // update conditional formats after table is inserted
/*N*/ if ( pCondFormList )
/*N*/ pCondFormList->UpdateReference( URM_INSDEL, aRange,
0,0,1 );
-/*N*/ // #81844# sheet names of references are not valid until
sheet is inserted
-/*N*/ if ( pChartListenerCollection )
-/*N*/
pChartListenerCollection->UpdateScheduledSeriesRanges();
/*N*/
/*N*/ SetDirty();
/*N*/ bValid = TRUE;
@@ -351,7 +348,6 @@ namespace binfilter {
/*N*/ SetDirty();
/*N*/ }
/*N*/ // #81844# sheet names of references are not valid until
sheet is deleted
-/*N*/ pChartListenerCollection->UpdateScheduledSeriesRanges();
/*N*/ SetAutoCalc( bOldAutoCalc );
/*N*/ bValid = TRUE;
/*N*/ }
@@ -383,8 +379,6 @@ namespace binfilter {
/*N*/ if (bValid)
/*N*/ {
/*N*/ pTab[nTab]->SetName(rName);
-/*N*/ if ( pChartListenerCollection )
-/*N*/
pChartListenerCollection->UpdateSeriesRangesContainingTab( nTab );
/*N*/ }
/*N*/ }
/*N*/ return bValid;
diff --git a/binfilter/bf_sc/source/core/tool/sc_chartlis.cxx
b/binfilter/bf_sc/source/core/tool/sc_chartlis.cxx
index 48cb6de..f6186d7 100644
--- a/binfilter/bf_sc/source/core/tool/sc_chartlis.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_chartlis.cxx
@@ -112,16 +112,10 @@ using namespace ::com::sun::star;
/*N*/ delete pUnoData;
/*N*/ }
-/*N*/ DataObject* ScChartListener::Clone() const
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");return NULL;
-/*N*/ }
-
/*N*/ void ScChartListener::SetUno(
/*N*/ const uno::Reference< chart::XChartDataChangeEventListener >&
rListener,
/*N*/ const uno::Reference< chart::XChartData >& rSource )
/*N*/ {
-/*N*/ //DBG_ASSERT( rListener.is() && rSource.is(), "Nullpointer bei
SetUno" );
/*N*/ delete pUnoData;
/*N*/ pUnoData = new ScChartUnoData( rListener, rSource );
/*N*/ }
@@ -237,18 +231,6 @@ using namespace ::com::sun::star;
/*N*/ FreeAll();
/*N*/ }
-/*N*/ DataObject* ScChartListenerCollection::Clone() const
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");return NULL;
-/*N*/ }
-
-
-/*N*/ void ScChartListenerCollection::ChangeListening( const String& /*rName*/,
-/*N*/ const ScRangeListRef& /*rRangeListRef*/, BOOL /*bDirty*/ )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
/*N*/ void ScChartListenerCollection::FreeUnused()
/*N*/ {
/*N*/ // rueckwaerts wg. Pointer-Aufrueckerei im Array
@@ -325,33 +307,6 @@ using namespace ::com::sun::star;
/*N*/ }
-
-
-
-
-/*N*/ void ScChartListenerCollection::UpdateScheduledSeriesRanges()
-/*N*/ {
-/*N*/ for ( USHORT nIndex = 0; nIndex < nCount; nIndex++ )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
-
-
-/*N*/ void ScChartListenerCollection::UpdateSeriesRangesContainingTab( USHORT
nTab )
-/*N*/ {
-/*N*/ ScRange aRange( 0, 0, nTab, MAXCOL, MAXROW, nTab );
-/*N*/ for ( USHORT nIndex = 0; nIndex < nCount; nIndex++ )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
-
-
-
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_sc/chartlis.hxx b/binfilter/inc/bf_sc/chartlis.hxx
index a40e7f9..5edda6d 100644
--- a/binfilter/inc/bf_sc/char
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/ExternalLib.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 159e0dd6a0fee832fcb877f089284758f35e2552 Author: Miklos Vajna Date: Sun Oct 2 16:05:11 2011 +0200 ExternalLib.mk: avoid pushd when cd is enough Reported-by: Julien Nabet Acked-by: Norbert Thiebaud diff --git a/solenv/gbuild/ExternalLib.mk b/solenv/gbuild/ExternalLib.mk index aeb6a6b..f25e79f 100644 --- a/solenv/gbuild/ExternalLib.mk +++ b/solenv/gbuild/ExternalLib.mk @@ -96,11 +96,11 @@ define gb_ExternalLib__command_autotools rm -fr $(call gb_ExternalLib_get_workdir,$(1)) && \ mkdir -p $(call gb_ExternalLib_get_builddir,$(1)) && \ tar -x -C $(call gb_ExternalLib_get_builddir,$(1)) --strip-component=1 -f $< && \ - pushd $(call gb_ExternalLib_get_builddir,$(1)) && for p in $(T_PATCHES) ; do patch -p 1 < $(gb_REPOS)/$$p || exit 1; done && \ + cd $(call gb_ExternalLib_get_builddir,$(1)) && for p in $(T_PATCHES) ; do patch -p 1 < $(gb_REPOS)/$$p || exit 1; done && \ CC="$(gb_CC)" CXX="$(gb_CXX)" CFLAGS="$(T_CFLAGS)" CXXFLAGS="$(T_CXXFLAGS)" PKG_CONFIG_PATH="$(PKG_CONFIG_PATH) $(OUTDIR)/lib/pkgconfig" ./configure --prefix=$(OUTDIR) $(T_CONF_ARGS) && \ for p in $(T_POST_PATCHES) ; do patch -p 1 < $(gb_REPOS)/$p || exit 1; done #we don't want a deployed rpath pointing into our solver, to-do, set correct ORIGIN-foo ? - pushd $(call gb_ExternalLib_get_builddir,$(1)) && if test -e libtool ; then sed -i 's,^hardcode_libdir_flag_spec=.*,hardcode_libdir_flag_spec="",g' libtool && sed -i 's,^runpath_var=LD_RUN_PATH,runpath_var=DIE_RPATH_DIE,g' libtool; fi + cd $(call gb_ExternalLib_get_builddir,$(1)) && if test -e libtool ; then sed -i 's,^hardcode_libdir_flag_spec=.*,hardcode_libdir_flag_spec="",g' libtool && sed -i 's,^runpath_var=LD_RUN_PATH,runpath_var=DIE_RPATH_DIE,g' libtool; fi +MAKEFLAGS=$(filterout r,$(MAKEFLAGS)) $(MAKE) -C $(call gb_ExternalLib_get_builddir,$(1)) +$(MAKE) -C $(call gb_ExternalLib_get_builddir,$(1)) install endef ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_sc
binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx | 59 -
binfilter/bf_sc/source/ui/inc/dbdocfun.hxx | 10 ---
binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx | 21 ---
3 files changed, 90 deletions(-)
New commits:
commit 4ba38b62e9dd88e2921564030faf7c3181ff7fcd
Author: Joseph Powers
Date: Sun Oct 2 06:44:13 2011 -0700
Cleanup class ScDBDocFunc a little
Please note that GetSubTotalParam(), GetAdvancedQuerySource(),
GetQueryParam(), GetSortParam() have no side effects.
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx
b/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx
index c6302e8..fc9170f 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx
@@ -227,39 +227,6 @@ namespace binfilter {
/*N*/ pDoc->CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTabCount-1,
IDF_FORMULA, FALSE, pUndoDoc );
/*N*/ }
/*N*/
-/*N*/ if (bSort && bSubTotal)
-/*N*/ {
-/*N*/ // Sortieren ohne SubTotals
-/*N*/
-/*N*/ aSubTotalParam.bRemoveOnly = TRUE; // wird unten
wieder zurueckgesetzt
-/*N*/ DoSubTotals( nTab, aSubTotalParam, NULL, FALSE, bApi );
-/*N*/ }
-/*N*/
-/*N*/ if (bSort)
-/*N*/ {
-/*N*/ pDBData->GetSortParam( aSortParam );// Bereich
kann sich geaendert haben
-/*N*/ Sort( nTab, aSortParam, FALSE, FALSE, bApi );
-/*N*/ }
-/*N*/ if (bQuery)
-/*N*/ {
-/*N*/ pDBData->GetQueryParam( aQueryParam ); // Bereich
kann sich geaendert haben
-/*N*/ ScRange aAdvSource;
-/*N*/ if (pDBData->GetAdvancedQuerySource(aAdvSource))
-/*N*/ Query( nTab, aQueryParam, &aAdvSource, FALSE, bApi );
-/*N*/ else
-/*N*/ Query( nTab, aQueryParam, NULL, FALSE, bApi );
-/*N*/
-/*N*/ // bei nicht-inplace kann die Tabelle umgestellt worden
sein
-/*N*/ //if ( !aQueryParam.bInplace && aQueryParam.nDestTab !=
nTab )
-/*N*/ //SetTabNo( nTab );
-/*N*/ }
-/*N*/ if (bSubTotal)
-/*N*/ {
-/*N*/ pDBData->GetSubTotalParam( aSubTotalParam );// Bereich
kann sich geaendert haben
-/*N*/ aSubTotalParam.bRemoveOnly = FALSE;
-/*N*/ DoSubTotals( nTab, aSubTotalParam, NULL, FALSE, bApi );
-/*N*/ }
-/*N*/
/*N*/ rDocShell.PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab,
/*N*/ PAINT_GRID | PAINT_LEFT | PAINT_TOP |
PAINT_SIZE );
/*N*/ bDone = TRUE;
@@ -270,32 +237,6 @@ namespace binfilter {
/*N*/ }
-/*N*/ BOOL ScDBDocFunc::Sort( USHORT /* nTab */, const ScSortParam& /*
rSortParam */,
-/*N*/ BOOL /* bRecord */, BOOL /* bPaint */, BOOL )
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/ OSL_FAIL( "Sort: keine DBData" );
-/*N*/ return FALSE;
-/*N*/ }
-
-
-/*N*/ BOOL ScDBDocFunc::Query( USHORT /* nTab */, const ScQueryParam& /*
rQueryParam */,
-/*N*/ const ScRange* /* pAdvSource */, BOOL /* bRecord
*/, BOOL /* bApi */ )
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/ OSL_FAIL( "Query: keine DBData" );
-/*N*/ return FALSE;
-/*N*/ }
-
-
-/*N*/ BOOL ScDBDocFunc::DoSubTotals( USHORT /* nTab */, const ScSubTotalParam&
/* rParam */,
-/*N*/ const ScSortParam* /*pForceNewSort*/, BOOL
/* bRecord */, BOOL )
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/ OSL_FAIL( "SubTotals: keine DBData" );
-/*N*/ return FALSE;
-/*N*/ }
-
/*N*/ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const
ScDPObject* pNewObj,
/*N*/ BOOL bRecord, BOOL )
/*N*/ {
diff --git a/binfilter/bf_sc/source/ui/inc/dbdocfun.hxx
b/binfilter/bf_sc/source/ui/inc/dbdocfun.hxx
index 1f83775..aa25da5 100644
--- a/binfilter/bf_sc/source/ui/inc/dbdocfun.hxx
+++ b/binfilter/bf_sc/source/ui/inc/dbdocfun.hxx
@@ -77,16 +77,6 @@ public:
const SbaSelectionList* pSelection, BOOL bRecord,
BOOL bAddrInsert = FALSE );
-BOOLSort( USHORT nTab, const ScSortParam& rSortParam,
-BOOL bRecord, BOOL bPaint, BOOL bApi );
-
-BOOLQuery( USHORT nTab, const ScQueryParam& rQueryParam,
-const ScRange* pAdvSource, BOOL bRecord, BOOL bApi
);
-
-BOOLDoSubTotals( USHORT nTab, const ScSubTotalParam& rParam,
-const ScSortParam* pForceNewSort,
-BOOL bRecord, BOOL bApi );
-
BOOLAddDBRange( const String& rName, const ScRange& rRange,
BOOL bApi );
BOOLDeleteDBRange( const String& rName, BOOL bApi );
BOOLRenameDBRange( const S
[Libreoffice-commits] .: binfilter/bf_sc binfilter/inc
binfilter/bf_sc/source/core/data/sc_dpshttab.cxx |7
binfilter/bf_sc/source/core/tool/sc_collect.cxx | 40 ---
binfilter/bf_sc/source/core/tool/sc_compiler.cxx | 18 --
binfilter/bf_sc/source/core/tool/sc_consoli.cxx | 31 -
binfilter/inc/bf_sc/collect.hxx | 23 +
binfilter/inc/bf_sc/column.hxx |1
binfilter/inc/bf_sc/document.hxx |1
binfilter/inc/bf_sc/dptabdat.hxx |2 -
8 files changed, 10 insertions(+), 113 deletions(-)
New commits:
commit c49dde7cea0c533da696752a064213c2d091e834
Author: Joseph Powers
Date: Sun Oct 2 06:10:59 2011 -0700
Class TypedStrCollection is not really used, so I'm deleting it.
Plus some miscellanous DBG_BF_ASSERT cleanup.
diff --git a/binfilter/bf_sc/source/core/data/sc_dpshttab.cxx
b/binfilter/bf_sc/source/core/data/sc_dpshttab.cxx
index 9aa89be..d3396c0 100644
--- a/binfilter/bf_sc/source/core/data/sc_dpshttab.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_dpshttab.cxx
@@ -52,7 +52,6 @@ namespace binfilter {
/*N*/ longnColCount;
/*N*/ BOOLbIgnoreEmptyRows;
/*N*/ BOOLbRepeatIfEmpty;
-/*N*/ TypedStrCollection**ppStrings;
/*N*/ BOOL* pDateDim;
/*N*/ USHORT nNextRow; // for iterator, within range
/*N*/
@@ -72,10 +71,7 @@ namespace binfilter {
/*M*/ pImpl->bIgnoreEmptyRows = FALSE;
/*M*/ pImpl->bRepeatIfEmpty = FALSE;
/*M*/ pImpl->nColCount = nCount;
-/*M*/ pImpl->ppStrings = new TypedStrCollection*[nCount];
/*M*/ pImpl->pDateDim = NULL;
-/*M*/ for (long i=0; ippStrings[i] = NULL;
/*M*/
/*M*/ pImpl->nNextRow = pImpl->aRange.aStart.Row() + 1;
/*M*/
@@ -106,9 +102,6 @@ namespace binfilter {
/*N*/ ScSheetDPData::~ScSheetDPData()
/*N*/ {
-/*N*/ for (long i=0; inColCount; i++)
-/*N*/ delete pImpl->ppStrings[i];
-/*N*/ delete[] pImpl->ppStrings;
/*N*/ delete[] pImpl->pDateDim;
/*N*/ delete pImpl;
/*M*/ delete[] pSpecial;
diff --git a/binfilter/bf_sc/source/core/tool/sc_collect.cxx
b/binfilter/bf_sc/source/core/tool/sc_collect.cxx
index 2ce86f7..773e5ba 100644
--- a/binfilter/bf_sc/source/core/tool/sc_collect.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_collect.cxx
@@ -193,13 +193,6 @@ namespace binfilter {
/*N*/ }
//
-
-/*N*/ DataObject* Collection::Clone() const
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP"); return NULL;
-/*N*/ }
-
-//
// SortedCollection
//
@@ -261,17 +254,6 @@ namespace binfilter {
//
-
-//
-
-
-//
-
-// IsEqual - komplette Inhalte vergleichen
-
-
-//
-
/*N*/ DataObject* StrData::Clone() const
/*N*/ {
return new StrData(*this); // #i49161# this is needed
@@ -292,13 +274,6 @@ namespace binfilter {
//
-/*N*/ DataObject* StrCollection::Clone() const
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP"); return NULL;
-/*N*/ }
-
-//
-
/*N*/ void StrCollection::Load( SvStream& rStream ) // Changetracking.sdc
/*N*/ {
/*N*/ ScReadHeader aHdr( rStream );
@@ -318,8 +293,6 @@ namespace binfilter {
/*N*/ }
//
-// TypedStrCollection
-//
/*N*/ TypedStrData::TypedStrData( ScDocument* pDoc, USHORT nCol, USHORT nRow,
USHORT nTab,
/*N*/ BOOL bAllStrings )
@@ -345,19 +318,6 @@ namespace binfilter {
/*N*/ }
-/*N*/ short TypedStrCollection::Compare( DataObject* /*pKey1*/, DataObject*
/*pKey2*/ ) const
-/*N*/ {
-/*N*/ short nResult = 0;
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return nResult;
-/*N*/ }
-
-
-// Gross-/Kleinschreibung anpassen
-
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
b/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
index dbb3a44..e67a51f 100644
--- a/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
@@ -767,9 +767,9 @@ namespace binfilter {
/*N*/ bFound = ScGlobal::GetFuncCollection()->SearchFunc(cSymbol,
nIndex);
/*N*/ if( bFound )
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); /*N*/ ScRawToken aToken;
-/*N*/ /*?*/aTok
[Libreoffice-commits] .: libcmis/ExternalLib_libcmis.mk
libcmis/ExternalLib_libcmis.mk | 10 ++ 1 file changed, 10 insertions(+) New commits: commit abb630be54f74e67d92be0ce038bbbadd31c4af8 Author: Norbert Thiebaud Date: Sun Oct 2 02:02:26 2011 -0500 make libcmis break a bit less on MacOSX.. but still no cigar diff --git a/libcmis/ExternalLib_libcmis.mk b/libcmis/ExternalLib_libcmis.mk index d7768d2..5ba0523 100644 --- a/libcmis/ExternalLib_libcmis.mk +++ b/libcmis/ExternalLib_libcmis.mk @@ -31,4 +31,14 @@ $(eval $(call gb_ExternalLib_ExternalLib,libcmis,autotools)) $(eval $(call gb_ExternalLib_set_src_package,libcmis,51eba115d4b25b5db571e385c1395ac8-libcmis-0.1.0.tar.gz)) $(eval $(call gb_ExternalLib_add_patch,libcmis,libcmis/addincludes.patch)) +ifeq ($(OS),MACOSX) + +$(eval $(call gb_ExternalLib_add_conf_arg,libcmis,'DEPS_LIBS="$(shell $MACOS_SDK_PATH/usr/bin/xml2-config --libs) $(shell $MACOS_SDK_PATH/usr/bin/curl-config --libs)"')) +$(eval $(call gb_ExternalLib_add_conf_arg,libcmis,'DEPS_CFLAGS="$(shell $MACOS_SDK_PATH/usr/bin/xml2-config --cflags) $(shell $MACOS_SDK_PATH/usr/bin/curl-config --cflags)"')) +$(eval $(call gb_ExternalLib_add_conf_arg,libcmis,'CPPUNIT_LIBS=""')) +$(eval $(call gb_ExternalLib_add_conf_arg,libcmis,'CPPUNIT_CFLAGS=""')) +$(eval $(call gb_ExternalLib_add_conf_arg,libcmis,--with-boost=$(OUTDIR)/inc)) + +endif + # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
