[Libreoffice-commits] core.git: 3 commits - ios/experimental sw/source
Tor Lillqvist
tml at collabora.com
Tue Apr 29 14:43:19 PDT 2014
ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj | 44 ++++++++++
sw/source/core/doc/docfld.cxx | 4
2 files changed, 45 insertions(+), 3 deletions(-)
New commits:
commit 304c7f7d3cbfb0a696de1fbaa169df109f55395e
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Apr 30 00:39:36 2014 +0300
Add some sources from framework for debugging convenience
Change-Id: Id6c6ce764f03849e63fd69dcc780155c98fee812
diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
index a0c044d..986da7f 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
@@ -697,6 +697,20 @@
BE9F4609186839C100B8BE69 /* unointerfaceproxy.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = unointerfaceproxy.cxx; path = ../../../bridges/source/cpp_uno/shared/unointerfaceproxy.cxx; sourceTree = "<group>"; };
BE9F460A186839C100B8BE69 /* vtablefactory.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = vtablefactory.cxx; path = ../../../bridges/source/cpp_uno/shared/vtablefactory.cxx; sourceTree = "<group>"; };
BE9F460B186839C100B8BE69 /* vtables.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = vtables.cxx; path = ../../../bridges/source/cpp_uno/shared/vtables.cxx; sourceTree = "<group>"; };
+ BECA60DB1910271F00B24A7E /* autorecovery.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = autorecovery.cxx; path = ../../../framework/source/services/autorecovery.cxx; sourceTree = "<group>"; };
+ BECA60DC1910271F00B24A7E /* ContextChangeEventMultiplexer.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ContextChangeEventMultiplexer.cxx; path = ../../../framework/source/services/ContextChangeEventMultiplexer.cxx; sourceTree = "<group>"; };
+ BECA60DD1910271F00B24A7E /* desktop.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = desktop.cxx; path = ../../../framework/source/services/desktop.cxx; sourceTree = "<group>"; };
+ BECA60DE1910271F00B24A7E /* dispatchhelper.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dispatchhelper.cxx; path = ../../../framework/source/services/dispatchhelper.cxx; sourceTree = "<group>"; };
+ BECA60DF1910271F00B24A7E /* frame.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = frame.cxx; path = ../../../framework/source/services/frame.cxx; sourceTree = "<group>"; };
+ BECA60E01910271F00B24A7E /* mediatypedetectionhelper.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mediatypedetectionhelper.cxx; path = ../../../framework/source/services/mediatypedetectionhelper.cxx; sourceTree = "<group>"; };
+ BECA60E11910271F00B24A7E /* modulemanager.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = modulemanager.cxx; path = ../../../framework/source/services/modulemanager.cxx; sourceTree = "<group>"; };
+ BECA60E21910271F00B24A7E /* pathsettings.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = pathsettings.cxx; path = ../../../framework/source/services/pathsettings.cxx; sourceTree = "<group>"; };
+ BECA60E31910271F00B24A7E /* sessionlistener.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sessionlistener.cxx; path = ../../../framework/source/services/sessionlistener.cxx; sourceTree = "<group>"; };
+ BECA60E41910271F00B24A7E /* substitutepathvars.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = substitutepathvars.cxx; path = ../../../framework/source/services/substitutepathvars.cxx; sourceTree = "<group>"; };
+ BECA60E51910271F00B24A7E /* tabwindowservice.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tabwindowservice.cxx; path = ../../../framework/source/services/tabwindowservice.cxx; sourceTree = "<group>"; };
+ BECA60E61910271F00B24A7E /* taskcreatorsrv.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = taskcreatorsrv.cxx; path = ../../../framework/source/services/taskcreatorsrv.cxx; sourceTree = "<group>"; };
+ BECA60E71910271F00B24A7E /* uriabbreviation.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = uriabbreviation.cxx; path = ../../../framework/source/services/uriabbreviation.cxx; sourceTree = "<group>"; };
+ BECA60E81910271F00B24A7E /* urltransformer.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = urltransformer.cxx; path = ../../../framework/source/services/urltransformer.cxx; sourceTree = "<group>"; };
BECAB371186054DE00F814F9 /* lo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = lo.mm; sourceTree = "<group>"; };
BED2593E18F6B87900C94C72 /* ImageIO.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ImageIO.framework; path = System/Library/Frameworks/ImageIO.framework; sourceTree = SDKROOT; };
BED2594018F6B89000C94C72 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
@@ -765,6 +779,7 @@
BE9F45F81868393D00B8BE69 /* bridges */,
BE55B10518DAD85E00950228 /* cppu */,
BE35B58A188FFA43001B7439 /* cppuhelper */,
+ BECA60D9191026BA00B24A7E /* framework */,
BE03BF9418FC199B00620DC7 /* i18npool */,
BE55B10818DB673300950228 /* oox */,
BE82C38818C752760050EB79 /* sal */,
@@ -1685,6 +1700,35 @@
name = bridges;
sourceTree = "<group>";
};
+ BECA60D9191026BA00B24A7E /* framework */ = {
+ isa = PBXGroup;
+ children = (
+ BECA60DA191026FA00B24A7E /* services */,
+ );
+ name = framework;
+ sourceTree = "<group>";
+ };
+ BECA60DA191026FA00B24A7E /* services */ = {
+ isa = PBXGroup;
+ children = (
+ BECA60DB1910271F00B24A7E /* autorecovery.cxx */,
+ BECA60DC1910271F00B24A7E /* ContextChangeEventMultiplexer.cxx */,
+ BECA60DD1910271F00B24A7E /* desktop.cxx */,
+ BECA60DE1910271F00B24A7E /* dispatchhelper.cxx */,
+ BECA60DF1910271F00B24A7E /* frame.cxx */,
+ BECA60E01910271F00B24A7E /* mediatypedetectionhelper.cxx */,
+ BECA60E11910271F00B24A7E /* modulemanager.cxx */,
+ BECA60E21910271F00B24A7E /* pathsettings.cxx */,
+ BECA60E31910271F00B24A7E /* sessionlistener.cxx */,
+ BECA60E41910271F00B24A7E /* substitutepathvars.cxx */,
+ BECA60E51910271F00B24A7E /* tabwindowservice.cxx */,
+ BECA60E61910271F00B24A7E /* taskcreatorsrv.cxx */,
+ BECA60E71910271F00B24A7E /* uriabbreviation.cxx */,
+ BECA60E81910271F00B24A7E /* urltransformer.cxx */,
+ );
+ name = services;
+ sourceTree = "<group>";
+ };
BEEEF9681860A21F00FBDE67 /* Resources */ = {
isa = PBXGroup;
children = (
commit e00b50651675e0cb868d785ba799a5c2d45f7bd6
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Apr 30 00:29:27 2014 +0300
Use a real assert() here
Change-Id: I20a59c1df814919f06ce294addbb0d678414f55d
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 6f06c07..e2931d2 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -1633,7 +1633,7 @@ void SwDoc::_InitFieldTypes() // is being called by the CTOR
mpFldTypes->push_back( new SwSetExpFieldType(this,
SW_RESSTR(STR_POOLCOLL_LABEL_DRAWING), nsSwGetSetExpType::GSE_SEQ) );
- OSL_ENSURE( mpFldTypes->size() == INIT_FLDTYPES, "Bad initsize: SwFldTypes" );
+ assert( mpFldTypes->size() == INIT_FLDTYPES );
}
void SwDoc::InsDelFldInFldLst( bool bIns, const SwTxtFld& rFld )
commit a8a40fd1d7ad44ea9417003770be8aab15223fdc
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Apr 30 00:24:30 2014 +0300
Can't use ifdefs here, the mpFldTypes array must have fixed contents
Each entry must be exactly at the right index.
Change-Id: Id8a4b517b4987c6a5c08a8625b6df9fe7d7438a4
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index fafb713..6f06c07 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -1607,11 +1607,9 @@ void SwDoc::_InitFieldTypes() // is being called by the CTOR
mpFldTypes->push_back( new SwTblFieldType( this ) );
mpFldTypes->push_back( new SwMacroFieldType(this) );
mpFldTypes->push_back( new SwHiddenParaFieldType );
-#if HAVE_FEATURE_DBCONNECTIVITY
mpFldTypes->push_back( new SwDBNextSetFieldType );
mpFldTypes->push_back( new SwDBNumSetFieldType );
mpFldTypes->push_back( new SwDBSetNumberFieldType );
-#endif
mpFldTypes->push_back( new SwTemplNameFieldType(this) );
mpFldTypes->push_back( new SwTemplNameFieldType(this) );
mpFldTypes->push_back( new SwExtUserFieldType );
More information about the Libreoffice-commits
mailing list