[PATCH] fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO
Hello Michael Stahl, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/5631 to look at the new patch set (#4). Change subject: fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO .. fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO Change-Id: Ibb2c27a75d8cbaf5177f392930cc9e6effa48d1d --- M Repository.mk M scp2/source/ooo/file_library_ooo.scp M scp2/source/ooo/module_hidden_ooo.scp 3 files changed, 21 insertions(+), 102 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/31/5631/4 -- To view, visit https://gerrit.libreoffice.org/5631 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ibb2c27a75d8cbaf5177f392930cc9e6effa48d1d Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO
Hello Michael Stahl, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/5631 to look at the new patch set (#5). Change subject: fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO .. fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO Change-Id: Ibb2c27a75d8cbaf5177f392930cc9e6effa48d1d --- M Repository.mk M scp2/source/ooo/file_library_ooo.scp M scp2/source/ooo/module_hidden_ooo.scp 3 files changed, 21 insertions(+), 102 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/31/5631/5 -- To view, visit https://gerrit.libreoffice.org/5631 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ibb2c27a75d8cbaf5177f392930cc9e6effa48d1d Gerrit-PatchSet: 5 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO
Hello LibreOffice gerrit bot, Björn Michaelsen, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/5571 to look at the new patch set (#4). Change subject: fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO .. fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO Change-Id: I973a66c6f805727cfaa5a5663ce4a9c200412a66 --- M Repository.mk M scp2/source/ooo/file_library_ooo.scp M scp2/source/ooo/module_hidden_ooo.scp 3 files changed, 15 insertions(+), 134 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/71/5571/4 -- To view, visit https://gerrit.libreoffice.org/5571 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I973a66c6f805727cfaa5a5663ce4a9c200412a66 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Björn Michaelsen bjoern.michael...@canonical.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO
Hello LibreOffice gerrit bot, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/5571 to look at the new patch set (#2). Change subject: fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO .. fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO Change-Id: I973a66c6f805727cfaa5a5663ce4a9c200412a66 --- M Repository.mk M scp2/source/ooo/file_library_ooo.scp M scp2/source/ooo/module_hidden_ooo.scp 3 files changed, 17 insertions(+), 145 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/71/5571/2 -- To view, visit https://gerrit.libreoffice.org/5571 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I973a66c6f805727cfaa5a5663ce4a9c200412a66 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO
Hello LibreOffice gerrit bot, Björn Michaelsen, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/5571 to look at the new patch set (#3). Change subject: fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO .. fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO Change-Id: I973a66c6f805727cfaa5a5663ce4a9c200412a66 --- M Repository.mk M scp2/source/ooo/file_library_ooo.scp M scp2/source/ooo/module_hidden_ooo.scp 3 files changed, 17 insertions(+), 145 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/71/5571/3 -- To view, visit https://gerrit.libreoffice.org/5571 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I973a66c6f805727cfaa5a5663ce4a9c200412a66 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Björn Michaelsen bjoern.michael...@canonical.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Fixes fdo#59642
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4314
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/14/4314/1
Fixes fdo#59642
By making just the one test, the most generic one, and not nesting strstr
functions calls.
Change-Id: I1b49e9faea6742594eaa900a87a03c4dd86c0b5c
---
M starmath/source/smdetect.cxx
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx
index e6a2ef8..7962f7a 100644
--- a/starmath/source/smdetect.cxx
+++ b/starmath/source/smdetect.cxx
@@ -317,8 +317,7 @@
sal_Char aBuffer2[200];
nBytesRead = pStrm-Read( aBuffer2,
sizeof(aBuffer2) - 1);
aBuffer2[nBytesRead] = 0;
-if (strstr( aBuffer2, math ) != NULL ||
-strstr( aBuffer2, math ) != NULL)
+if (strstr( aBuffer2, math ))
{
static const sal_Char sFltrNm_2[] =
MATHML_XML;
static const sal_Char sTypeNm_2[] =
math_MathML_XML_Math;
--
To view, visit https://gerrit.libreoffice.org/4314
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b49e9faea6742594eaa900a87a03c4dd86c0b5c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza marcos.souza@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Remove useless attributions in starmath
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4282
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/82/4282/1
Remove useless attributions in starmath
These values are initialized as 0 in the constructor(see
starmath/source/parse.cxx).
Change-Id: I68508f7f7132a2f43b99da3e7cdef9709fd62598
---
M starmath/source/mathmlimport.cxx
1 file changed, 0 insertions(+), 29 deletions(-)
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index b5f0529..4d1f95e 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -719,7 +719,6 @@
{
SmToken aToken;
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
aToken.nLevel = 5;
if (nIsBold != -1)
@@ -960,7 +959,6 @@
SmToken aToken;
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
aToken.nLevel = 5;
aToken.eType = TPHANTOM;
@@ -1024,7 +1022,6 @@
{
SmToken aToken;
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
aToken.aText = ,;
aToken.eType = TLEFT;
aToken.nLevel = 5;
@@ -1110,7 +1107,6 @@
: SmXMLImportContext(rImport,nPrefix,rLName)
{
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
aToken.nLevel = 5;
aToken.eType = TNUMBER;
}
@@ -1190,7 +1186,6 @@
: SmXMLImportContext(rImport,nPrefix,rLName)
{
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
aToken.nLevel = 5;
aToken.eType = TTEXT;
}
@@ -1223,7 +1218,6 @@
: SmXMLImportContext(rImport,nPrefix,rLName)
{
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
aToken.nLevel = 5;
aToken.eType = TTEXT;
}
@@ -1267,7 +1261,6 @@
: SmXMLImportContext(rImport,nPrefix,rLName),aStyleHelper(*this)
{
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
aToken.nLevel = 5;
aToken.eType = TIDENT;
}
@@ -1332,7 +1325,6 @@
const OUString rLName)
: SmXMLImportContext(rImport,nPrefix,rLName), bIsStretchy(sal_False)
{
-aToken.nGroup = 0;
aToken.eType = TSPECIAL;
aToken.nLevel = 5;
}
@@ -1404,7 +1396,6 @@
{
SmToken aToken;
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
aToken.eType = TBLANK;
aToken.nLevel = 5;
SmBlankNode *pBlank = new SmBlankNode(aToken);
@@ -1441,8 +1432,6 @@
SmToken aToken;
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
-aToken.nLevel = 0;
aToken.eType = eType;
SmSubSupNode *pNode = new SmSubSupNode(aToken);
SmNodeStack rNodeStack = GetSmImport().GetNodeStack();
@@ -1503,8 +1492,6 @@
SmToken aToken;
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
-aToken.nLevel = 0;
aToken.eType = eType;
SmSubSupNode *pNode = new SmSubSupNode(aToken);
SmNodeStack rNodeStack = GetSmImport().GetNodeStack();
@@ -1557,8 +1544,6 @@
SmNode *pTest = lcl_popOrZero(rNodeStack);
SmToken aToken;
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
-aToken.nLevel = 0;
aToken.eType = TUNDERLINE;
@@ -1632,8 +1617,6 @@
SmToken aToken;
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
-aToken.nLevel = 0;
aToken.eType = TACUTE;
SmAttributNode *pNode = new SmAttributNode(aToken);
@@ -1701,7 +1684,6 @@
{
SmToken aToken;
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
aToken.aText = ;
aToken.nLevel = 5;
aToken.eType = TIDENT;
@@ -2184,8 +2166,6 @@
SmToken aToken;
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
-aToken.nLevel = 0;
aToken.eType = TOVER;
SmStructureNode *pSNode = new SmBinVerNode(aToken);
SmNode *pOper = new SmRectangleNode(aToken);
@@ -2205,8 +2185,6 @@
SmToken aToken;
aToken.cMathChar = MS_SQRT; //Temporary: alert, based on StarSymbol font
-aToken.nGroup = 0;
-aToken.nLevel = 0;
aToken.eType = TNROOT;
SmStructureNode *pSNode = new SmRootNode(aToken);
SmNode *pOper = new SmRootSymbolNode(aToken);
@@ -2229,8 +2207,6 @@
SmToken aToken;
aToken.cMathChar = MS_SQRT; //Temporary: alert, based on StarSymbol font
-aToken.nGroup = 0;
-aToken.nLevel = 0;
aToken.eType = TSQRT;
SmStructureNode *pSNode = new SmRootNode(aToken);
SmNode *pOper = new SmRootSymbolNode(aToken);
@@ -2266,7 +2242,6 @@
{
SmToken aToken;
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
aToken.nLevel = 5;
int nLeft=0,nRight=0;
@@ -2321,7 +2296,6 @@
aRelationArray.resize(1);
SmToken aToken;
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
aToken.nLevel = 5;
aToken.eType = TNEWLINE;
aRelationArray[0] = new SmLineNode(aToken);
@@ -2452,8 +2426,6 @@
{
SmToken aToken;
aToken.cMathChar = '\0';
-
[PATCH] fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/4267 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/67/4267/1 fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO Change-Id: I7a3511172ac8ddd060c51c0339a4b9ff16216668 --- M Repository.mk M scp2/source/ooo/file_library_ooo.scp M scp2/source/ooo/module_hidden_ooo.scp 3 files changed, 13 insertions(+), 64 deletions(-) diff --git a/Repository.mk b/Repository.mk index 543275e..151df15 100644 --- a/Repository.mk +++ b/Repository.mk @@ -296,6 +296,7 @@ log \ lng \ lnth \ + $(if $(filter $(OS),MACOSX),macbe1) \ $(if $(MERGELIBS),merged) \ migrationoo2 \ migrationoo3 \ @@ -378,7 +379,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ adabas \ adabasui \ - ado \ agg \ $(if $(filter $(OS),ANDROID),, \ basebmp \ @@ -387,10 +387,8 @@ oox \ ooxml \ sdbc \ - AppleRemote \ avmediaQuickTime \ filtertracer \ - MacOSXSpell \ mork \ mozab2 \ mozabdrv \ @@ -519,9 +517,20 @@ xmlsecurity \ xsec_fw \ xstor \ + $(if $(filter $(OS),WNT), \ + ado \ + $(if $(ENABLE_DIRECTX),avmediawin) \ + $(if $(DISABLE_ATL),,oleautobridge) \ + smplmail \ + wininetbe1 \ + ) \ + $(if $(filter $(OS),MACOSX), \ + AppleRemote \ + fps_aqua \ + MacOSXSpell \ + ) \ )) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - avmediawin \ bluez_bluetooth \ emboleobj \ java_uno_accessbridge \ @@ -583,20 +592,11 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ cmdmail \ - macbe1 \ OGLTrans \ pdfimport \ postgresql-sdbc \ postgresql-sdbc-impl \ pythonloader \ - $(if $(filter $(OS),MACOSX), \ - fps_aqua \ - ) \ - $(if $(filter $(OS),WNT), \ - oleautobridge \ - smplmail \ - wininetbe1 \ - ) \ )) $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \ diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 8e57fb7..cad2d7c 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -35,10 +35,6 @@ End #endif -#if defined(WNT) -STD_LIB_FILE( gid_File_Lib_Ado, ado) -#endif - #ifndef SYSTEM_CLUCENE File gid_File_Lib_CLucene LIB_FILE_BODY; @@ -215,15 +211,6 @@ #endif #ifdef MACOSX -STD_LIB_FILE( gid_File_Lib_Fps_Aqua, fps_aqua ) - -File gid_File_Lib_MacOSXSpell - LIB_FILE_BODY; - Styles = (PACKED); - Name = LIBNAME(MacOSXSpell); - Dir = SCP2_OOO_BIN_DIR; -End - #ifndef X86_64 File gid_File_Lib_avmediaQuickTime LIB_FILE_BODY; @@ -425,10 +412,6 @@ #endif #endif -#if defined(WNT) !defined(DISABLE_ATL) -STD_LIB_FILE( gid_File_Lib_Ole, oleautobridge ) -#endif - #if defined ENABLE_NPAPI_FROM_BROWSER STD_LIB_FILE( gid_File_Lib_Pl , pl) #endif @@ -458,15 +441,6 @@ Dir = SCP2_OOO_BIN_DIR; End #endif -#endif - -#if defined(MACOSX) -File gid_File_Lib_AppleRemote -Name = LIBNAME(AppleRemote); -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; -End #endif #if defined(MACOSX) @@ -535,10 +509,6 @@ #endif -#ifdef WNT -STD_LIB_FILE( gid_File_Lib_Smplmail, smplmail ) -#endif - #if defined(UNX) !defined(MACOSX) !defined(LIBO_HEADLESS) File gid_File_Lib_Spa @@ -568,15 +538,6 @@ Dir = SCP2_OOO_BIN_DIR; Name = sysdtrans.dll; End -#endif - - -#ifdef WNT -STD_LIB_FILE( gid_File_Lib_Wininetbe, wininetbe1 ) -#endif - -#ifdef MACOSX -STD_LIB_FILE( gid_File_Lib_Macbe, macbe1 ) #endif #ifndef DISABLE_NEON @@ -655,12 +616,6 @@ #endif #endif End -#endif - -#if defined WNT -#ifdef ENABLE_DIRECTX -SPECIAL_LIB_FILE( gid_File_Lib_AVMediaWin, avmediawin ) -#endif #endif #ifdef WNT diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 59ab1d4..6f5325e 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -147,7 +147,6 @@ gid_File_Lib_Oox, gid_File_Lib_Pl, gid_File_Lib_Spa, - gid_File_Lib_AVMediaWin, gid_File_Lib_Sysdtrans, gid_File_Lib_BaseBmp, gid_File_Lib_Zip, @@ -219,7 +218,6 @@ gid_File_Lib_Cmdmail, gid_File_Lib_I18n, gid_File_Lib_Accessbridge, - gid_File_Lib_Ado, gid_File_Lib_Dl, gid_File_Lib_Dnd, gid_File_Lib_Dtrans, @@ -228,14 +226,10 @@ gid_File_Lib_Ftransl, gid_File_Lib_sn_tools, GID_FILE_LIB_WPD, - gid_File_Lib_Ole, gid_File_Lib_Reg4allmsdoc, gid_File_Lib_Qslnkmsi, gid_File_Lib_Sdqsmsi,
[PATCH] fdo#60924 autoinstall - gbuild/scp2: still more libs to OOO
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/4268 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/68/4268/1 fdo#60924 autoinstall - gbuild/scp2: still more libs to OOO Change-Id: Ia3a0a740263e92752115665ab5e25c5063b1858a --- M Repository.mk M scp2/source/ooo/file_library_ooo.scp M scp2/source/ooo/module_hidden_ooo.scp 3 files changed, 16 insertions(+), 160 deletions(-) diff --git a/Repository.mk b/Repository.mk index 151df15..a71a7a0 100644 --- a/Repository.mk +++ b/Repository.mk @@ -520,9 +520,24 @@ $(if $(filter $(OS),WNT), \ ado \ $(if $(ENABLE_DIRECTX),avmediawin) \ - $(if $(DISABLE_ATL),,oleautobridge) \ +dnd \ +dtrans \ +fps \ +ftransl \ + $(if $(SOLAR_JAVA),java_uno_accessbridge) \ + $(if $(DISABLE_ATL),,oleautobridge \ + ,inprocserv +) \ +$(if $(HAVE_WINDOWS_SDK),instooofiltmsi \ +,qslnkmsi \ +,sdqsmsi \ +,sellangmsi \ +,reg4allmsdoc \ +,sn_tools +) \ smplmail \ wininetbe1 \ +xmlsec1 \ ) \ $(if $(filter $(OS),MACOSX), \ AppleRemote \ @@ -533,7 +548,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ bluez_bluetooth \ emboleobj \ - java_uno_accessbridge \ libreoffice \ macab1 \ macabdrv1 \ @@ -554,28 +568,17 @@ ifeq ($(OS),WNT) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - dnd \ - dtrans \ fop \ - fps \ - ftransl \ - inprocserv \ - instooofiltmsi \ jfregca \ ooofilt \ ooofilt_x64 \ propertyhdl \ propertyhdl_x64 \ - qslnkmsi \ - reg4allmsdoc \ regactivex \ regpatchactivex \ - sdqsmsi \ - sellangmsi \ shlxthdl \ shlxthdl_x64 \ shlxtmsi \ - sn_tools \ so_activex \ so_activex_x64 \ sysdtrans \ @@ -618,7 +621,6 @@ ifeq ($(OS),WNT) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - xmlsec1 \ xmlsec1-nss \ )) ifneq ($(CROSS_COMPILING),YES) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index cad2d7c..036ca4a 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -26,15 +26,6 @@ / #include macros.inc -#if defined SOLAR_JAVA defined WNT -File gid_File_Lib_Accessbridge -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; -Name = java_uno_accessbridge.dll; -End -#endif - #ifndef SYSTEM_CLUCENE File gid_File_Lib_CLucene LIB_FILE_BODY; @@ -121,42 +112,9 @@ #endif -#ifdef WNT - -File gid_File_Lib_Dnd -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; -Name = dnd.dll; -End - -#endif - -#ifdef WNT - -File gid_File_Lib_Dtrans -LIB_FILE_BODY; -Name = dtrans.dll; -Dir = SCP2_OOO_BIN_DIR; -Styles = (PACKED); -End - -#endif - /* fdo#60491 always need emboleobj library on non-WNT platforms */ #if !defined(WNT) || !defined(DISABLE_ATL) SPECIAL_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj) -#endif - -#if defined(WNT) !defined(DISABLE_ATL) - -File gid_File_Lib_Inprocserv -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; -Name = inprocserv.dll; -End - #endif #ifdef UNX @@ -178,17 +136,6 @@ #endif // #ifdef MACOSX #endif // #ifdef UNX - -#ifdef WNT - -File gid_File_Lib_Fps -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; -Name = fps.dll; -End - -#endif #if defined UNX ! defined MACOSX #ifdef ENABLE_TDE @@ -284,17 +231,6 @@ #endif -#ifdef WNT - -File gid_File_Lib_Ftransl -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; -Name = ftransl.dll; -End - -#endif - #ifndef SYSTEM_ICU File gid_File_Lib_Icudata @@ -355,17 +291,6 @@ #endif Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED); -End - -#endif - -#if defined(WNT) defined(HAVE_WINDOWS_SDK) - -File gid_File_Lib_sn_tools -LIB_FILE_BODY; -Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY, DONTRENAMEINPATCH); -Dir = SCP2_OOO_BIN_DIR; -Name = sn_tools.dll; End #endif @@ -470,44 +395,7 @@ #endif -#if defined(WNT) defined(HAVE_WINDOWS_SDK) - -File gid_File_Lib_Reg4allmsdoc -LIB_FILE_BODY; -Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); -Dir = SCP2_OOO_BIN_DIR; -Name = reg4allmsdoc.dll; -End - -File gid_File_Lib_Qslnkmsi -
[PATCH] fdo#60924 autoinstall - gbuild/scp2: Move some libs to OOO a...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/4231 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/31/4231/1 fdo#60924 autoinstall - gbuild/scp2: Move some libs to OOO and clean a little Also put the vbaswobj lib in the right place, inside Writer Change-Id: I52ecc75e26f5f1997d3a575682b78fbd673e4591 --- M Repository.mk M scp2/source/ooo/file_library_ooo.scp M scp2/source/ooo/module_hidden_ooo.scp M scp2/source/writer/module_writer.scp 4 files changed, 30 insertions(+), 224 deletions(-) diff --git a/Repository.mk b/Repository.mk index c37f6d6..98ff1a3 100644 --- a/Repository.mk +++ b/Repository.mk @@ -214,10 +214,13 @@ )) $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ + acc \ avmedia \ $(if $(DISABLE_SCRIPTING),,basctl) \ + $(if $(DISABLE_SCRIPTING),,basprov) \ basegfx \ bib \ + cached1 \ $(if $(ENABLE_CAIRO_CANVAS),cairocanvas) \ canvasfactory \ canvastools \ @@ -235,6 +238,7 @@ deploymentmisc \ $(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \ $(if $(filter unx,$(GUIBASE)),desktop_detector) \ + $(if $(DISABLE_SCRIPTING),,dlgprov) \ $(if $(ENABLE_DIRECTX),directx9canvas) \ drawinglayer \ editeng \ @@ -250,9 +254,13 @@ eti \ evtatt \ exp \ + expwrap \ + fastsax \ flat \ file \ filterconfig \ + fpicker \ + fps_office \ for \ forui \ frm \ @@ -266,6 +274,9 @@ guesslang \ $(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \ i18npool \ + i18nsearch \ + hatchwindowfactory \ + $(if $(SOLAR_JAVA),hsqldb) \ hyphen \ icd \ icg \ @@ -282,49 +293,67 @@ $(if $(SOLAR_JAVA),jdbc) \ $(if $(ENABLE_KAB),kab1) \ $(if $(ENABLE_KAB),kabdrv1) \ + ldapbe2 \ localebe1 \ + localedata_en \ + localedata_es \ + localedata_euro \ + localedata_others \ + log \ lng \ lnth \ $(if $(MERGELIBS),merged) \ msfilter \ + $(if $(DISABLE_SCRIPTING),,msforms) \ mtfrenderer \ mysql \ odbc \ odbcbase \ odfflatxml \ offacc \ + passwordcontainer \ pcr \ pdffilter \ + $(if $(DISABLE_SCRIPTING),,protocolhandler) \ res \ sax \ sb \ sdbt \ scn \ + $(if $(DISABLE_SCRIPTING),,scriptframe) \ sd \ + sdbc2 \ sdd \ sdfilt \ sdui \ sfx \ simplecanvas \ + slideshow \ sot \ + spell \ $(if $(ENABLE_HEADLESS),,spl) \ + $(if $(DISABLE_SCRIPTING),,stringresource) \ svgio \ svl \ svt \ svx \ svxcore \ sw \ + syssh \ $(if $(ENABLE_TDEAB),tdeab1) \ $(if $(ENABLE_TDEAB),tdeabdrv1) \ textconversiondlgs \ tk \ tl \ $(if $(ENABLE_TELEPATHY),tubes) \ + tvhlp1 \ ucpexpand1 \ unordf \ unoxml \ utl \ uui \ + $(if $(DISABLE_SCRIPTING),,vbaevents) \ + $(if $(DISABLE_SCRIPTING),,vbahelper) \ vcl \ vclcanvas \ $(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))),vclplug_gen) \ @@ -344,12 +373,12 @@ swd \ swui \ t602filter \ + $(if $(DISABLE_SCRIPTING),,vbaswobj) \ wpftwriter \ writerfilter \ )) $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ - acc \ adabas \ adabasui \ ado \ @@ -364,21 +393,17 @@ AppleRemote \ avmediaQuickTime \ filtertracer \ - log \ MacOSXSpell \ mork \ mozab2 \ mozabdrv \ - protocolhandler \ rpt \ rptui \ rptxml \ simplecm \ spa \ - spell \ sts \ textfd \ - $(if $(DISABLE_SCRIPTING),,vbahelper) \ vclplug_tde \ vclplug_kde \ vclplug_kde4 \ @@ -476,7 +501,6 @@ avmediagst_0_10 \ avmediawin \ bluez_bluetooth \ - cached1 \ collator_data \ dbpool2 \ deploymentgui \ @@ -484,14 +508,9 @@ dict_zh \ embobj \ emboleobj \ - hsqldb \ index_data \ java_uno_accessbridge \ libreoffice \ - localedata_en \ - localedata_es \ - localedata_euro \ - localedata_others \ macab1 \ macabdrv1 \ mozbootstrap \ @@ -499,11 +518,8 @@ pyuno \ pyuno_wrapper \ recentfile \ - scriptframe \ - sdbc2 \ srtrs1 \ textconv_dict \ - tvhlp1 \ ucpdav1 \ ucpftp1 \ ucpchelp1 \ @@ -560,35 +576,19 @@ )) $(eval $(call
[PATCH] fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/4232 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/32/4232/1 fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO Change-Id: I1553317afe8df9877a41b1d4087c96d861ed1377 --- M Repository.mk M scp2/source/ooo/file_library_ooo.scp M scp2/source/ooo/module_hidden_ooo.scp 3 files changed, 25 insertions(+), 185 deletions(-) diff --git a/Repository.mk b/Repository.mk index 98ff1a3..13d8e10 100644 --- a/Repository.mk +++ b/Repository.mk @@ -216,6 +216,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ acc \ avmedia \ + $(if $(ENABLE_GSTREAMER),avmediagst) \ + $(if $(ENABLE_GSTREAMER_0_10),avmediagst_0_10) \ $(if $(DISABLE_SCRIPTING),,basctl) \ $(if $(DISABLE_SCRIPTING),,basprov) \ basegfx \ @@ -227,23 +229,29 @@ chartcore \ chartcontroller \ cppcanvas \ + collator_data \ configmgr \ ctl \ cui \ dba \ dbase \ dbmm \ + dbpool2 \ $(if $(DISABLE_DBCONNECTIVITY),,dbtools) \ dbaxml \ + deploymentgui \ deploymentmisc \ $(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \ $(if $(filter unx,$(GUIBASE)),desktop_detector) \ $(if $(DISABLE_SCRIPTING),,dlgprov) \ + dict_ja \ + dict_zh \ $(if $(ENABLE_DIRECTX),directx9canvas) \ drawinglayer \ editeng \ egi \ eme \ + embobj \ $(if $(filter WNT,$(OS)),$(if $(DISABLE_ATL),,emser)) \ epb \ epg \ @@ -275,6 +283,7 @@ $(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \ i18npool \ i18nsearch \ + index_data \ hatchwindowfactory \ $(if $(SOLAR_JAVA),hsqldb) \ hyphen \ @@ -303,6 +312,8 @@ lng \ lnth \ $(if $(MERGELIBS),merged) \ + migrationoo2 \ + migrationoo3 \ msfilter \ $(if $(DISABLE_SCRIPTING),,msforms) \ mtfrenderer \ @@ -332,6 +343,7 @@ sot \ spell \ $(if $(ENABLE_HEADLESS),,spl) \ + srtrs1 \ $(if $(DISABLE_SCRIPTING),,stringresource) \ svgio \ svl \ @@ -342,14 +354,25 @@ syssh \ $(if $(ENABLE_TDEAB),tdeab1) \ $(if $(ENABLE_TDEAB),tdeabdrv1) \ + textconv_dict \ textconversiondlgs \ + textfd \ tk \ tl \ $(if $(ENABLE_TELEPATHY),tubes) \ tvhlp1 \ ucpexpand1 \ + ucpext \ + ucpchelp1 \ + ucpcmis1 \ + ucptdoc1 \ + ucpftp1 \ + ucphier1 \ + ucppkg1 \ + unopkgapp \ unordf \ unoxml \ + updatefeed \ utl \ uui \ $(if $(DISABLE_SCRIPTING),,vbaevents) \ @@ -357,9 +380,11 @@ vcl \ vclcanvas \ $(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))),vclplug_gen) \ + xsec_fw \ xmlscript \ xmlfa \ xmlfd \ + xmlsecurity \ xo \ xof \ xsltdlg \ @@ -403,7 +428,6 @@ simplecm \ spa \ sts \ - textfd \ vclplug_tde \ vclplug_kde \ vclplug_kde4 \ @@ -497,18 +521,9 @@ xstor \ )) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - avmediagst \ - avmediagst_0_10 \ avmediawin \ bluez_bluetooth \ - collator_data \ - dbpool2 \ - deploymentgui \ - dict_ja \ - dict_zh \ - embobj \ emboleobj \ - index_data \ java_uno_accessbridge \ libreoffice \ macab1 \ @@ -518,16 +533,7 @@ pyuno \ pyuno_wrapper \ recentfile \ - srtrs1 \ - textconv_dict \ ucpdav1 \ - ucpftp1 \ - ucpchelp1 \ - ucphier1 \ - ucppkg1 \ - unopkgapp \ - xmlsecurity \ - xsec_fw \ xsec_xmlsec \ $(if $(filter $(OS),ANDROID), \ lo-bootstrap \ @@ -578,17 +584,11 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ cmdmail \ macbe1 \ - migrationoo2 \ - migrationoo3 \ OGLTrans \ pdfimport \ postgresql-sdbc \ postgresql-sdbc-impl \ pythonloader \ - ucpcmis1 \ - ucpext \ - ucptdoc1 \ - updatefeed \ $(if $(filter $(OS),MACOSX), \ fps_aqua \ ) \ diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 1e1a261..9a8bf6b 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -125,72 +125,6 @@ #endif -File gid_File_Lib_Dbpool -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX -Name = STRING(CONCAT2(libdbpool2,UNXSUFFIX)); - #else -Name = dbpool2.dll; - #endif -End - -File
[PATCH] fdo#60924 autoinstall - gbuild/scp2: add calc module
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/4225 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/25/4225/1 fdo#60924 autoinstall - gbuild/scp2: add calc module Change-Id: I89e87f2e107bdb31f19262c83f8e20be9642a4eb --- M Repository.mk M scp2/AutoInstallLibs.mk M scp2/InstallModule_calc.mk M scp2/source/calc/file_calc.scp M scp2/source/calc/module_calc.scp M solenv/gbuild/Helper.mk 6 files changed, 22 insertions(+), 32 deletions(-) diff --git a/Repository.mk b/Repository.mk index 748fb61..068cbb8 100644 --- a/Repository.mk +++ b/Repository.mk @@ -209,6 +209,19 @@ dbu \ )) +$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,CALC, \ +analysis \ +calc \ +date \ +pricing \ +sc \ +scd \ +scfilt \ +scui \ +solver \ +vbaobj \ +)) + $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,GRAPHICFILTER, \ svgfilter \ flash \ @@ -393,35 +406,26 @@ adabasui \ ado \ agg \ -analysis \ $(if $(filter $(OS),ANDROID),, \ basebmp \ ) \ communi \ -date \ oox \ ooxml \ sdbc \ AppleRemote \ avmediaQuickTime \ -calc \ filtertracer \ log \ MacOSXSpell \ mork \ mozab2 \ mozabdrv \ -pricing \ protocolhandler \ rpt \ rptui \ rptxml \ -sc \ -scd \ -scfilt \ -scui \ simplecm \ -solver \ spa \ spell \ sts \ @@ -636,7 +640,6 @@ ucptdoc1 \ updatefeed \ vbaevents \ -vbaobj \ vbaswobj \ $(if $(filter $(OS),MACOSX), \ fps_aqua \ diff --git a/scp2/AutoInstallLibs.mk b/scp2/AutoInstallLibs.mk index 7fc4878..5db0d39 100644 --- a/scp2/AutoInstallLibs.mk +++ b/scp2/AutoInstallLibs.mk @@ -10,6 +10,7 @@ $(eval $(call gb_AutoInstallLibs_AutoInstallLibs)) $(eval $(call gb_AutoInstallLibs_add_category,base,BASE,LIBO_LIB_FILE,auto_Base_Lib)) +$(eval $(call gb_AutoInstallLibs_add_category,calc,CALC,LIBO_LIB_FILE,auto_Calc_Lib)) $(eval $(call gb_AutoInstallLibs_add_category,gnome,GNOME,LIBO_LIB_FILE,auto_Gnome_Lib)) $(eval $(call gb_AutoInstallLibs_add_category,graphicfilter,GRAPHICFILTER,LIBO_LIB_FILE,auto_Graphicfilter_Lib)) $(eval $(call gb_AutoInstallLibs_add_category,impress,IMPRESS,LIBO_LIB_FILE,auto_Impress_Lib)) diff --git a/scp2/InstallModule_calc.mk b/scp2/InstallModule_calc.mk index dba5960..acb1009 100644 --- a/scp2/InstallModule_calc.mk +++ b/scp2/InstallModule_calc.mk @@ -9,6 +9,8 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/calc)) +$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/calc,calc)) + $(eval $(call gb_InstallModule_define_if_set,scp2/calc,\ ENABLE_LPSOLVE \ SYSTEM_LPSOLVE \ diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp index 115681b..3f17394 100644 --- a/scp2/source/calc/file_calc.scp +++ b/scp2/source/calc/file_calc.scp @@ -18,11 +18,7 @@ #include macros.inc -STD_LIB_FILE( gid_File_Lib_Solver, solver) - -STD_LIB_FILE( gid_File_Lib_Analysis, analysis) - -STD_LIB_FILE( gid_File_Lib_Pricing, pricing) +#include AutoInstallLibs/calc File gid_File_Share_Registry_Calc_Xcd TXT_FILE_BODY; @@ -30,18 +26,6 @@ Dir = gid_Brand_Dir_Share_Registry; Name = calc.xcd; End - -STD_LIB_FILE( gid_File_Lib_Calc, calc) - -STD_LIB_FILE( gid_File_Lib_Date, date) - -STD_LIB_FILE( gid_File_Lib_Sc, sc) - -STD_LIB_FILE( gid_File_Lib_Scui, scui) - -STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt) - -STD_LIB_FILE( gid_File_Lib_Scd, scd) STD_RES_FILE( gid_File_Res_Analysis, analysis) diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp index 46b4271..a23a0bbb 100644 --- a/scp2/source/calc/module_calc.scp +++ b/scp2/source/calc/module_calc.scp @@ -33,9 +33,9 @@ Minimal = YES; Default = YES; Styles = (HIDDEN_ROOT); -Files = (gid_File_Share_Registry_Calc_Xcd,gid_File_Lib_Calc,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scfilt,gid_File_Lib_Scd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg, -gid_File_Lib_Solver,gid_File_Lib_Lpsolve, -gid_File_Lib_Vbaobj, +Files = (auto_Calc_Lib_ALL + gid_File_Share_Registry_Calc_Xcd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg, +gid_File_Lib_Lpsolve, gid_File_Tmp_Userinstall_Calc_Inf); End @@ -45,7 +45,7 @@ ParentID = gid_Module_Prg_Calc_Bin; Sortkey = 700; Default = YES; -Files = (gid_File_Lib_Date,gid_File_Zip_Addin,gid_File_Lib_Rot,gid_File_Lib_Dfa,gid_File_Lib_Analysis,gid_File_Lib_Pricing); +Files = (gid_File_Zip_Addin,gid_File_Lib_Rot); End Module gid_Module_Brand_Prg_Calc diff --git a/solenv/gbuild/Helper.mk
[ABANDONED] Fix fdo#32062: Math overwrites selected area when new elemen...
Marcos Souza has abandoned this change. Change subject: Fix fdo#32062: Math overwrites selected area when new element .. Patch Set 1: Abandoned Forgive this by now -- To view, visit https://gerrit.libreoffice.org/3982 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: If1623b5bc1ae5c491d67b4a21c76a08c928b50b6 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz Gerrit-Reviewer: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Ricardo Montania rica...@linuxafundo.com.br Gerrit-Reviewer: Rodolfo Ribeiro Gomes l...@rodolfo.eng.br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] Fix fdo#32720: limit buttons doesn't add the sum sign
Marcos Souza has abandoned this change. Change subject: Fix fdo#32720: limit buttons doesn't add the sum sign .. Patch Set 1: Abandoned So, leave it as is. -- To view, visit https://gerrit.libreoffice.org/4067 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I9086707f14335ea26bb94c36ee0f87e770c9418b Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz Gerrit-Reviewer: Marcos Souza marcos.souza@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] fdo#60924 autoinstall - gbuild/scp2: add math module
Marcos Souza has abandoned this change. Change subject: fdo#60924 autoinstall - gbuild/scp2: add math module .. Patch Set 1: Abandoned Will send a new rebased patch -- To view, visit https://gerrit.libreoffice.org/3919 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I0ee6ac3fc32356dac6b3cc498d98ab71fdea29ad Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org Gerrit-Reviewer: Marcos Souza marcos.souza@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#60924 autoinstall - gbuild/scp2: add math module
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/4065 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/65/4065/1 fdo#60924 autoinstall - gbuild/scp2: add math module Change-Id: I466dd68069576d57740ef34b8f6fcd8f9025c5c8 --- M Repository.mk A scp2/AutoInstallLibs_math.mk M scp2/InstallModule_math.mk M scp2/Module_scp2.mk M scp2/source/math/file_math.scp M scp2/source/math/module_math.scp M solenv/gbuild/Helper.mk 7 files changed, 25 insertions(+), 8 deletions(-) diff --git a/Repository.mk b/Repository.mk index 723d7a3..2b4a3de 100644 --- a/Repository.mk +++ b/Repository.mk @@ -252,6 +252,11 @@ $(if $(ENABLE_KDE4),kde4be1) \ )) +$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,MATH, \ +sm \ +smd \ +)) + $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ avmedia \ $(if $(DISABLE_SCRIPTING),,basctl) \ @@ -419,8 +424,6 @@ scfilt \ scui \ simplecm \ -sm \ -smd \ solver \ spa \ spell \ diff --git a/scp2/AutoInstallLibs_math.mk b/scp2/AutoInstallLibs_math.mk new file mode 100644 index 000..a7ceda8 --- /dev/null +++ b/scp2/AutoInstallLibs_math.mk @@ -0,0 +1,12 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_AutoInstallLibs_AutoInstallLibs,math,MATH,LIBO_LIB_FILE,auto_Math_Lib)) + +# vim: set noet sw=4 ts=4: diff --git a/scp2/InstallModule_math.mk b/scp2/InstallModule_math.mk index 57f5c2d..e25c25e 100644 --- a/scp2/InstallModule_math.mk +++ b/scp2/InstallModule_math.mk @@ -9,6 +9,8 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/math)) +$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/math,math)) + $(eval $(call gb_InstallModule_add_templates,scp2/math,\ scp2/source/templates/module_langpack_math \ )) diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index f34449f..3178920 100644 --- a/scp2/Module_scp2.mk +++ b/scp2/Module_scp2.mk @@ -15,6 +15,7 @@ AutoInstallLibs_tde \ AutoInstallLibs_gnome \ AutoInstallLibs_kde \ + AutoInstallLibs_math \ AutoInstallLibs_ooo \ AutoInstallLibs_ure \ AutoInstallLibs_writer \ diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp index 0c016ee..d9ccc96 100644 --- a/scp2/source/math/file_math.scp +++ b/scp2/source/math/file_math.scp @@ -27,10 +27,6 @@ #include macros.inc -STD_LIB_FILE( gid_File_Lib_Sm , sm) - -STD_LIB_FILE( gid_File_Lib_Smd , smd) - STD_RES_FILE( gid_File_Res_Sm, sm ) File gid_File_Share_Registry_Math_Xcd diff --git a/scp2/source/math/module_math.scp b/scp2/source/math/module_math.scp index f222441..1626623 100644 --- a/scp2/source/math/module_math.scp +++ b/scp2/source/math/module_math.scp @@ -27,6 +27,8 @@ #include macros.inc +#include AutoInstallLibs/math + Module gid_Module_Prg_Math MOD_NAME_DESC ( MODULE_PRG_MATH ); ParentID = gid_Module_Prg; @@ -42,7 +44,8 @@ Minimal = YES; Default = YES; Styles = (HIDDEN_ROOT); -Files = (gid_File_Lib_Sm,gid_File_Lib_Smd,gid_File_Extra_Urlmore_Math,gid_File_Extra_Urlnew_Math,gid_File_Extra_Urltasks_Math, +Files = (auto_Math_Lib_ALL + gid_File_Extra_Urlmore_Math,gid_File_Extra_Urlnew_Math,gid_File_Extra_Urltasks_Math, gid_File_Share_Registry_Math_Xcd, gid_File_Tmp_Userinstall_Math_Inf); End diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index 1a1befc..f60ac36 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -118,7 +118,7 @@ define gb_Helper_init_registries gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTVERLIBS UNOLIBS_URE UNOVERLIBS EXTENSIONLIBS -gb_Library_VALIDINSTALLMODULES := ONLINEUPDATE GRAPHICFILTER GNOME TDE KDE OOO URE WRITER +gb_Library_VALIDINSTALLMODULES := ONLINEUPDATE GRAPHICFILTER GNOME TDE KDE MATH OOO URE WRITER gb_StaticLibrary_VALIDGROUPS := PLAINLIBS gb_Jar_VALIDGROUPS := URE OOO OXT NONE -- To view, visit https://gerrit.libreoffice.org/4065 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I466dd68069576d57740ef34b8f6fcd8f9025c5c8 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Fix fdo#32720: limit buttons doesn't add the sum sign
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4067
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/67/4067/1
Fix fdo#32720: limit buttons doesn't add the sum sign
Change-Id: I9086707f14335ea26bb94c36ee0f87e770c9418b
---
M starmath/source/commands.src
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/starmath/source/commands.src b/starmath/source/commands.src
index e6a002f..26ece56 100644
--- a/starmath/source/commands.src
+++ b/starmath/source/commands.src
@@ -149,9 +149,9 @@
String RID_LLLINT_FROMX { Text = lllint from{?} ? ; };
String RID_LLLINT_TOX { Text = lllint to{?} ? ; };
String RID_LLLINT_FROMTOX { Text = lllint from{?} to{?} ? ; };
-String RID_FROMX{ Text = from{?} ? ; };
-String RID_TOX { Text = to{?} ? ; };
-String RID_FROMXTOY { Text = from{?} to{?} ? ; };
+String RID_FROMX{ Text = sum from{?} ? ; };
+String RID_TOX { Text = sum to{?} ? ; };
+String RID_FROMXTOY { Text = sum from{?} to{?} ? ; };
String RID_ACUTEX { Text = acute ? ; };
String RID_BARX { Text = bar ? ; };
String RID_BREVEX { Text = breve ? ; };
--
To view, visit https://gerrit.libreoffice.org/4067
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9086707f14335ea26bb94c36ee0f87e770c9418b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza marcos.souza@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] fdo#60924: autoinstall onlineupdate libraries
Marcos Souza has abandoned this change. Change subject: fdo#60924: autoinstall onlineupdate libraries .. Patch Set 1: Abandoned This change is merged with other commit related to onlineupdate -- To view, visit https://gerrit.libreoffice.org/3878 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I9e06d165351161ff144b7605094a3e490d13d5f2 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org Gerrit-Reviewer: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Matúš Kukan matus.ku...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Remove dead log-area
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3992 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/92/3992/1 Remove dead log-area The nullcanvas was removed in 1cd9b5d859a6468164b043b0fcaaf49c1907500c Change-Id: I2d718d1a18bb405e72b198ced548fc7cb885c6d7 --- M include/sal/log-areas.dox 1 file changed, 0 insertions(+), 1 deletion(-) diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox index 90eeecd..6db37e5 100644 --- a/include/sal/log-areas.dox +++ b/include/sal/log-areas.dox @@ -42,7 +42,6 @@ @li @c canvas @li @c canvas.cairo -@li @c canvas.null @li @c canvas.vcl @section chart2 -- To view, visit https://gerrit.libreoffice.org/3992 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2d718d1a18bb405e72b198ced548fc7cb885c6d7 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Fix fdo#32062: Math overwrites selected area when new elemen...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3982 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/82/3982/1 Fix fdo#32062: Math overwrites selected area when new element We're appending the new simbol in front of the selected formula. Change-Id: If1623b5bc1ae5c491d67b4a21c76a08c928b50b6 --- M starmath/source/edit.cxx 1 file changed, 6 insertions(+), 0 deletions(-) diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx index fc88ba7..d6608db 100644 --- a/starmath/source/edit.cxx +++ b/starmath/source/edit.cxx @@ -714,6 +714,12 @@ OSL_ENSURE( pEditView, NULL pointer ); OUString aText = SM_RESSTR(nCommand); + +OUString selected(pEditView-GetSelected()); +// if we have a formula selected, apply the command around the formula +if (selected.getLength()) +aText = aText.replaceAll(?, selected); + pEditView-InsertText(aText); if (HasMark(aText)) -- To view, visit https://gerrit.libreoffice.org/3982 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If1623b5bc1ae5c491d67b4a21c76a08c928b50b6 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Fix fdo#32059: Commands merge with variables
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3983 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/83/3983/1 Fix fdo#32059: Commands merge with variables Verify if there is a space before insert a new command to not merge variables. Change-Id: Ia5ddb4c4c8233b3779c0ee0c7009e181cfe5d1c3 --- M starmath/source/edit.cxx 1 file changed, 6 insertions(+), 0 deletions(-) diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx index fc88ba7..2c452ca 100644 --- a/starmath/source/edit.cxx +++ b/starmath/source/edit.cxx @@ -714,6 +714,12 @@ OSL_ENSURE( pEditView, NULL pointer ); OUString aText = SM_RESSTR(nCommand); + +// put an space before put a new command +OUString aTerm(pEditView-GetEditEngine()-GetText()); +if (!aTerm.endsWith( )) +aText = + aText; + pEditView-InsertText(aText); if (HasMark(aText)) -- To view, visit https://gerrit.libreoffice.org/3983 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia5ddb4c4c8233b3779c0ee0c7009e181cfe5d1c3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#60924 autoinstall - gbuild/scp2: add math module
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3919 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/19/3919/1 fdo#60924 autoinstall - gbuild/scp2: add math module Change-Id: I0ee6ac3fc32356dac6b3cc498d98ab71fdea29ad --- M Repository.mk A scp2/AutoInstallLibs_math.scp M scp2/InstallModule_math.mk M scp2/Module_scp2.mk M scp2/source/math/module_math.scp M solenv/gbuild/Helper.mk 6 files changed, 23 insertions(+), 2 deletions(-) diff --git a/Repository.mk b/Repository.mk index 3cbed03..e3af12e 100644 --- a/Repository.mk +++ b/Repository.mk @@ -240,6 +240,9 @@ $(if $(ENABLE_KDE4),kde4be1) \ )) +$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,MATH, \ +)) + $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ avmedia \ $(if $(DISABLE_SCRIPTING),,basctl) \ diff --git a/scp2/AutoInstallLibs_math.scp b/scp2/AutoInstallLibs_math.scp new file mode 100644 index 000..a7ceda8 --- /dev/null +++ b/scp2/AutoInstallLibs_math.scp @@ -0,0 +1,12 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_AutoInstallLibs_AutoInstallLibs,math,MATH,LIBO_LIB_FILE,auto_Math_Lib)) + +# vim: set noet sw=4 ts=4: diff --git a/scp2/InstallModule_math.mk b/scp2/InstallModule_math.mk index 57f5c2d..e25c25e 100644 --- a/scp2/InstallModule_math.mk +++ b/scp2/InstallModule_math.mk @@ -9,6 +9,8 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/math)) +$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/math,math)) + $(eval $(call gb_InstallModule_add_templates,scp2/math,\ scp2/source/templates/module_langpack_math \ )) diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index 9dc1cb6..1c7fdec 100644 --- a/scp2/Module_scp2.mk +++ b/scp2/Module_scp2.mk @@ -14,6 +14,7 @@ AutoInstallLibs_tde \ AutoInstallLibs_gnome \ AutoInstallLibs_kde \ + AutoInstallLibs_math \ AutoInstallLibs_ooo \ AutoInstallLibs_ure \ AutoInstallLibs_writer \ diff --git a/scp2/source/math/module_math.scp b/scp2/source/math/module_math.scp index f222441..a6fcb62 100644 --- a/scp2/source/math/module_math.scp +++ b/scp2/source/math/module_math.scp @@ -27,6 +27,8 @@ #include macros.inc +#include AutoInstallLibs/math + Module gid_Module_Prg_Math MOD_NAME_DESC ( MODULE_PRG_MATH ); ParentID = gid_Module_Prg; @@ -42,7 +44,8 @@ Minimal = YES; Default = YES; Styles = (HIDDEN_ROOT); -Files = (gid_File_Lib_Sm,gid_File_Lib_Smd,gid_File_Extra_Urlmore_Math,gid_File_Extra_Urlnew_Math,gid_File_Extra_Urltasks_Math, +Files = (auto_Math_Lib_ALL + gid_File_Lib_Sm,gid_File_Lib_Smd,gid_File_Extra_Urlmore_Math,gid_File_Extra_Urlnew_Math,gid_File_Extra_Urltasks_Math, gid_File_Share_Registry_Math_Xcd, gid_File_Tmp_Userinstall_Math_Inf); End diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index aa87379..5ca9b31 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -118,7 +118,7 @@ define gb_Helper_init_registries gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTVERLIBS UNOLIBS_URE UNOVERLIBS EXTENSIONLIBS -gb_Library_VALIDINSTALLMODULES := GRAPHICFILTER GNOME TDE KDE OOO URE WRITER +gb_Library_VALIDINSTALLMODULES := GRAPHICFILTER GNOME TDE KDE MATH OOO URE WRITER gb_StaticLibrary_VALIDGROUPS := PLAINLIBS gb_Jar_VALIDGROUPS := URE OOO OXT NONE -- To view, visit https://gerrit.libreoffice.org/3919 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0ee6ac3fc32356dac6b3cc498d98ab71fdea29ad Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Big ISDigit method and use isAsciiDigit from CharClass
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3888
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/88/3888/1
Big ISDigit method and use isAsciiDigit from CharClass
Also remove the unused function strnccmp.
Change-Id: Ie857dfca1e52b1251f85abfba3cd0e12e509974f
---
M starmath/source/parse.cxx
1 file changed, 3 insertions(+), 17 deletions(-)
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 04278e1..9ae5dff 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -50,12 +50,6 @@
}
}
-static inline bool strnccmp(const String u1, xub_StrLen nIdx,
- const sal_Char *s2, xub_StrLen nLen)
-{
-return u1.EqualsIgnoreCaseAscii( s2, nIdx, nLen );
-}
-
static const sal_Unicode aDelimiterTable[] =
{
' ','\t', '\n', '\r', '+','-','*','/','=',
'#',
@@ -63,14 +57,6 @@
')','{','}','[',']','^','_',
'\0'// end of list symbol
};
-
-
-static inline bool IsDigit( sal_Unicode cChar )
-{
-return '0' = cChar cChar = '9';
-}
-
-///
SmToken::SmToken() :
eType (TUNKNOWN),
@@ -432,7 +418,7 @@
// #i45779# parse numbers correctly
// i.e. independent from the locale setting.
// (note that #i11752# remains fixed)
-if ((aRes.TokenType KParseType::IDENTNAME) IsDigit( cFirstChar ))
+if ((aRes.TokenType KParseType::IDENTNAME)
CharClass::isAsciiDigit( cFirstChar ))
{
ParseResult aTmpRes;
LanguageTag aOldLoc( aCC.getLanguageTag() );
@@ -928,7 +914,7 @@
{
cChar = m_aBufferString.GetChar( ++m_nBufferIndex
);
}
-while ( cChar == '.' || IsDigit( cChar ) );
+while ( cChar == '.' || CharClass::isAsciiDigit( cChar
) );
m_aCurToken.aText = m_aBufferString.Copy(
sal::static_int_cast xub_StrLen (nTxtStart),
sal::static_int_cast xub_StrLen (m_nBufferIndex - nTxtStart) );
@@ -1915,7 +1901,7 @@
else
bPoint = true;
}
-else if ( !IsDigit( cChar ) )
+else if ( !CharClass::isAsciiDigit( cChar ) )
return false;
}
return true;
--
To view, visit https://gerrit.libreoffice.org/3888
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie857dfca1e52b1251f85abfba3cd0e12e509974f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza marcos.souza@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#60924 autoinstall - gbuild/scp2: add onlineupdate module
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3877 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/77/3877/1 fdo#60924 autoinstall - gbuild/scp2: add onlineupdate module Change-Id: Ib541799e5bd8c95878d61dadbad2bcca80d44367 --- M Repository.mk M scp2/InstallModule_onlineupdate.mk M scp2/Module_scp2.mk M scp2/source/onlineupdate/module_onlineupdate.scp M solenv/gbuild/Helper.mk 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Repository.mk b/Repository.mk index 3cbed03..f419beb 100644 --- a/Repository.mk +++ b/Repository.mk @@ -232,6 +232,9 @@ $(if $(ENABLE_TDE),tdebe1) \ )) +$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ONLINEUPDATE, \ +)) + $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,GNOME, \ )) diff --git a/scp2/InstallModule_onlineupdate.mk b/scp2/InstallModule_onlineupdate.mk index 76b1b78..fa9fe75 100644 --- a/scp2/InstallModule_onlineupdate.mk +++ b/scp2/InstallModule_onlineupdate.mk @@ -9,6 +9,8 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/onlineupdate)) +$(eval $(call gb_InstallModule_InstallModule_use_auto_install_libs,scp2/onlineupdate,onlineupdate)) + $(eval $(call gb_InstallModule_add_scpfiles,scp2/onlineupdate,\ scp2/source/onlineupdate/file_onlineupdate \ )) diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index 5bccae0..4c1880b 100644 --- a/scp2/Module_scp2.mk +++ b/scp2/Module_scp2.mk @@ -10,6 +10,7 @@ $(eval $(call gb_Module_Module,scp2)) $(eval $(call gb_Module_add_targets,scp2,\ + AutoInstallLibs_onlineupdate \ AutoInstallLibs_graphicfilter \ AutoInstallLibs_tde \ AutoInstallLibs_gnome \ diff --git a/scp2/source/onlineupdate/module_onlineupdate.scp b/scp2/source/onlineupdate/module_onlineupdate.scp index 29da635..586edfe 100644 --- a/scp2/source/onlineupdate/module_onlineupdate.scp +++ b/scp2/source/onlineupdate/module_onlineupdate.scp @@ -27,6 +27,8 @@ #include macros.inc +#include AutoInstallLibs/onlineupdate + Module gid_Module_Optional_Onlineupdate PackageInfo = packinfo_office.txt; MOD_NAME_DESC(MODULE_OPT_ONLINEUPDATE); @@ -34,7 +36,8 @@ ParentID = gid_Module_Optional; Default = YES; Styles = (); -Files = (gid_File_Bin_UnpackUpdate, +Files = (auto_Onlineupdate_lib_ALL + gid_File_Bin_UnpackUpdate, gid_File_Lib_Updchk, gid_File_Lib_Updchkui, gid_File_Share_Registry_Onlineupdate_Xcd); diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index aa87379..1a1befc 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -118,7 +118,7 @@ define gb_Helper_init_registries gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTVERLIBS UNOLIBS_URE UNOVERLIBS EXTENSIONLIBS -gb_Library_VALIDINSTALLMODULES := GRAPHICFILTER GNOME TDE KDE OOO URE WRITER +gb_Library_VALIDINSTALLMODULES := ONLINEUPDATE GRAPHICFILTER GNOME TDE KDE OOO URE WRITER gb_StaticLibrary_VALIDGROUPS := PLAINLIBS gb_Jar_VALIDGROUPS := URE OOO OXT NONE -- To view, visit https://gerrit.libreoffice.org/3877 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib541799e5bd8c95878d61dadbad2bcca80d44367 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#60924: autoinstall onlineupdate libraries
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3878 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/78/3878/1 fdo#60924: autoinstall onlineupdate libraries Change-Id: I9e06d165351161ff144b7605094a3e490d13d5f2 --- M Repository.mk M scp2/InstallModule_onlineupdate.mk M scp2/source/onlineupdate/file_onlineupdate.scp M scp2/source/onlineupdate/module_onlineupdate.scp 4 files changed, 2 insertions(+), 28 deletions(-) diff --git a/Repository.mk b/Repository.mk index f419beb..e9e9480 100644 --- a/Repository.mk +++ b/Repository.mk @@ -233,6 +233,8 @@ )) $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ONLINEUPDATE, \ +updatecheckui \ +updchk \ )) $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,GNOME, \ @@ -419,7 +421,6 @@ spell \ sts \ textfd \ -updatecheckui \ $(if $(DISABLE_SCRIPTING),,vbahelper) \ vclplug_gtk \ vclplug_gtk3 \ @@ -554,7 +555,6 @@ ucphier1 \ ucppkg1 \ unopkgapp \ -updchk \ xmlsecurity \ xsec_fw \ xsec_xmlsec \ diff --git a/scp2/InstallModule_onlineupdate.mk b/scp2/InstallModule_onlineupdate.mk index fa9fe75..feb6e1b 100644 --- a/scp2/InstallModule_onlineupdate.mk +++ b/scp2/InstallModule_onlineupdate.mk @@ -11,10 +11,6 @@ $(eval $(call gb_InstallModule_InstallModule_use_auto_install_libs,scp2/onlineupdate,onlineupdate)) -$(eval $(call gb_InstallModule_add_scpfiles,scp2/onlineupdate,\ -scp2/source/onlineupdate/file_onlineupdate \ -)) - $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/onlineupdate,\ scp2/source/onlineupdate/module_onlineupdate \ )) diff --git a/scp2/source/onlineupdate/file_onlineupdate.scp b/scp2/source/onlineupdate/file_onlineupdate.scp index 023097f..f157ac2 100644 --- a/scp2/source/onlineupdate/file_onlineupdate.scp +++ b/scp2/source/onlineupdate/file_onlineupdate.scp @@ -27,16 +27,6 @@ #include macros.inc -File gid_File_Lib_Updchk -BIN_FILE_BODY; -Styles = (PACKED); -Dir = gid_Brand_Dir_Program; -Name = SPECIAL_NAME(updchk); -ComponentCondition=ISCHECKFORPRODUCTUPDATES=1; -End - -STD_LIB_FILE(gid_File_Lib_Updchkui, updatecheckui) - File gid_File_Share_Registry_Onlineupdate_Xcd TXT_FILE_BODY; Styles = (PACKED); @@ -44,12 +34,3 @@ Name = onlineupdate.xcd; ComponentCondition=ISCHECKFORPRODUCTUPDATES=1; End - -#if defined LINUX || defined SOLARIS -File gid_File_Bin_UnpackUpdate -BIN_FILE_BODY; -Dir = gid_Brand_Dir_Program; -Name = unpack_update; -Styles = (PACKED); -End -#endif diff --git a/scp2/source/onlineupdate/module_onlineupdate.scp b/scp2/source/onlineupdate/module_onlineupdate.scp index 586edfe..ce19716 100644 --- a/scp2/source/onlineupdate/module_onlineupdate.scp +++ b/scp2/source/onlineupdate/module_onlineupdate.scp @@ -37,8 +37,5 @@ Default = YES; Styles = (); Files = (auto_Onlineupdate_lib_ALL - gid_File_Bin_UnpackUpdate, - gid_File_Lib_Updchk, - gid_File_Lib_Updchkui, gid_File_Share_Registry_Onlineupdate_Xcd); End -- To view, visit https://gerrit.libreoffice.org/3878 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9e06d165351161ff144b7605094a3e490d13d5f2 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#60924 autoinstall - gbuild/scp2: add graphicfilter modul...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3827 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/27/3827/1 fdo#60924 autoinstall - gbuild/scp2: add graphicfilter module Change-Id: I7823b4f0d8b7ab99ef549361a89f12036bf63270 --- M Repository.mk A scp2/AutoInstallLibs_graphicfilter.mk M scp2/InstallModule_graphicfilter.mk M scp2/Module_scp2.mk M scp2/source/graphicfilter/module_graphicfilter.scp M solenv/gbuild/Helper.mk 6 files changed, 22 insertions(+), 2 deletions(-) diff --git a/Repository.mk b/Repository.mk index 7e6c051..fc6e737 100644 --- a/Repository.mk +++ b/Repository.mk @@ -221,6 +221,9 @@ endif +$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,GRAPHICFILTER, \ +)) + $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,TDE, \ $(if $(ENABLE_TDE),tdebe1) \ )) diff --git a/scp2/AutoInstallLibs_graphicfilter.mk b/scp2/AutoInstallLibs_graphicfilter.mk new file mode 100644 index 000..08efa78 --- /dev/null +++ b/scp2/AutoInstallLibs_graphicfilter.mk @@ -0,0 +1,12 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_AutoInstallLibs_AutoInstallLibs,graphicfilter,GRAPHICFILTER,LIBO_LIB_FILE,auto_Graphicfilter_Lib)) + +# vim: set noet sw=4 ts=4: diff --git a/scp2/InstallModule_graphicfilter.mk b/scp2/InstallModule_graphicfilter.mk index b7f2a8c..1858d93 100644 --- a/scp2/InstallModule_graphicfilter.mk +++ b/scp2/InstallModule_graphicfilter.mk @@ -9,6 +9,8 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/graphicfilter)) +$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/graphicfilter,graphicfilter)) + $(eval $(call gb_InstallModule_add_scpfiles,scp2/graphicfilter,\ scp2/source/graphicfilter/file_graphicfilter \ )) diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index 67e8a81..5bccae0 100644 --- a/scp2/Module_scp2.mk +++ b/scp2/Module_scp2.mk @@ -10,6 +10,7 @@ $(eval $(call gb_Module_Module,scp2)) $(eval $(call gb_Module_add_targets,scp2,\ + AutoInstallLibs_graphicfilter \ AutoInstallLibs_tde \ AutoInstallLibs_gnome \ AutoInstallLibs_kde \ diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp b/scp2/source/graphicfilter/module_graphicfilter.scp index cd7e4a6..bd148a8 100644 --- a/scp2/source/graphicfilter/module_graphicfilter.scp +++ b/scp2/source/graphicfilter/module_graphicfilter.scp @@ -27,13 +27,15 @@ #include macros.inc +#include AutoInstallLibs/graphicfilter + Module gid_Module_Optional_Grfflt PackageInfo = packinfo_office.txt; MOD_NAME_DESC ( MODULE_OPTIONAL_GRFFLT ); Sortkey = 600; ParentID = gid_Module_Optional; Default = YES; -Files = ( +Files = (auto_Graphicfilter_Lib_ALL gid_File_Lib_Svg, gid_File_Lib_Flash, gid_File_Lib_WpftDraw, diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index 168cdf7..aa87379 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -118,7 +118,7 @@ define gb_Helper_init_registries gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTVERLIBS UNOLIBS_URE UNOVERLIBS EXTENSIONLIBS -gb_Library_VALIDINSTALLMODULES := GNOME TDE KDE OOO URE WRITER +gb_Library_VALIDINSTALLMODULES := GRAPHICFILTER GNOME TDE KDE OOO URE WRITER gb_StaticLibrary_VALIDGROUPS := PLAINLIBS gb_Jar_VALIDGROUPS := URE OOO OXT NONE -- To view, visit https://gerrit.libreoffice.org/3827 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7823b4f0d8b7ab99ef549361a89f12036bf63270 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#60924: autoinstall graphicfilter libraries
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3829 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/29/3829/1 fdo#60924: autoinstall graphicfilter libraries Change-Id: I406ecef9bc1865d0cd17e3428bff137d972f --- M Repository.mk M scp2/InstallModule_graphicfilter.mk D scp2/source/graphicfilter/file_graphicfilter.scp M scp2/source/graphicfilter/module_graphicfilter.scp 4 files changed, 4 insertions(+), 56 deletions(-) diff --git a/Repository.mk b/Repository.mk index fc6e737..3cbed03 100644 --- a/Repository.mk +++ b/Repository.mk @@ -222,6 +222,10 @@ endif $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,GRAPHICFILTER, \ +svgfilter \ +flash \ +wpftdraw \ +graphicfilter \ )) $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,TDE, \ @@ -388,8 +392,6 @@ dbu \ evoab \ filtertracer \ - flash \ -graphicfilter \ log \ MacOSXSpell \ mork \ @@ -413,7 +415,6 @@ spa \ spell \ sts \ -svgfilter \ textfd \ updatecheckui \ $(if $(DISABLE_SCRIPTING),,vbahelper) \ @@ -423,7 +424,6 @@ vclplug_kde \ vclplug_kde4 \ vclplug_svp \ -wpftdraw \ )) ifneq (,$(filter ANDROID IOS,$(OS))) diff --git a/scp2/InstallModule_graphicfilter.mk b/scp2/InstallModule_graphicfilter.mk index 1858d93..f166e25 100644 --- a/scp2/InstallModule_graphicfilter.mk +++ b/scp2/InstallModule_graphicfilter.mk @@ -11,10 +11,6 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/graphicfilter,graphicfilter)) -$(eval $(call gb_InstallModule_add_scpfiles,scp2/graphicfilter,\ -scp2/source/graphicfilter/file_graphicfilter \ -)) - $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/graphicfilter,\ scp2/source/graphicfilter/module_graphicfilter \ )) diff --git a/scp2/source/graphicfilter/file_graphicfilter.scp b/scp2/source/graphicfilter/file_graphicfilter.scp deleted file mode 100644 index 535688d..000 --- a/scp2/source/graphicfilter/file_graphicfilter.scp +++ /dev/null @@ -1,44 +0,0 @@ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * http://www.openoffice.org/license.html - * for a copy of the LGPLv3 License. - * - / - -#include macros.inc - -File gid_File_Share_Registry_Graphicfilter_Xcd -TXT_FILE_BODY; -Styles = (PACKED); -Dir = gid_Brand_Dir_Share_Registry; -Name = graphicfilter.xcd; -End - -STD_LIB_FILE( gid_File_Lib_Flash, flash ) -STD_RES_FILE( gid_File_Res_Flash, flash ) - -STD_LIB_FILE( gid_File_Lib_Svg, svgfilter ) - -STD_LIB_FILE( gid_File_Lib_Graphic, graphicfilter ) - -STD_LIB_FILE( gid_File_Lib_WpftDraw, wpftdraw ) diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp b/scp2/source/graphicfilter/module_graphicfilter.scp index bd148a8..9ebfcc2 100644 --- a/scp2/source/graphicfilter/module_graphicfilter.scp +++ b/scp2/source/graphicfilter/module_graphicfilter.scp @@ -36,9 +36,5 @@ ParentID = gid_Module_Optional; Default = YES; Files = (auto_Graphicfilter_Lib_ALL -gid_File_Lib_Svg, -gid_File_Lib_Flash, -gid_File_Lib_WpftDraw, -gid_File_Lib_Graphic, gid_File_Share_Registry_Graphicfilter_Xcd); End -- To view, visit https://gerrit.libreoffice.org/3829 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I406ecef9bc1865d0cd17e3428bff137d972f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#60924 autoinstall - gbuild/scp2: add tde module
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3808 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/08/3808/1 fdo#60924 autoinstall - gbuild/scp2: add tde module Change-Id: I4c13d1cd4b7490a0b4db8f0dd40d823a5906c8aa --- M Repository.mk A scp2/AutoInstallLibs_tde.mk M scp2/InstallModule_tde.mk M scp2/Module_scp2.mk M scp2/source/tde/module_tde.scp M solenv/gbuild/Helper.mk 6 files changed, 22 insertions(+), 2 deletions(-) diff --git a/Repository.mk b/Repository.mk index e04e7ec..18ce81b 100644 --- a/Repository.mk +++ b/Repository.mk @@ -221,6 +221,9 @@ endif +$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,TDE, \ +)) + $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,KDE, \ $(if $(ENABLE_KDE),kdebe1) \ $(if $(ENABLE_KDE4),kde4be1) \ diff --git a/scp2/AutoInstallLibs_tde.mk b/scp2/AutoInstallLibs_tde.mk new file mode 100644 index 000..daea3c3 --- /dev/null +++ b/scp2/AutoInstallLibs_tde.mk @@ -0,0 +1,12 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_AutoInstallLibs_AutoInstallLibs,tde,TDE,LIBO_LIB_FILE,auto_Tde_Lib)) + +# vim: set noet sw=4 ts=4: diff --git a/scp2/InstallModule_tde.mk b/scp2/InstallModule_tde.mk index f42ef03..ad7655e 100644 --- a/scp2/InstallModule_tde.mk +++ b/scp2/InstallModule_tde.mk @@ -9,6 +9,8 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/tde)) +$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/tde,tde)) + $(eval $(call gb_InstallModule_define_if_set,scp2/tde,\ ENABLE_TDE \ ENABLE_TDEAB \ diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index 4173445..b5bb1f0 100644 --- a/scp2/Module_scp2.mk +++ b/scp2/Module_scp2.mk @@ -10,6 +10,7 @@ $(eval $(call gb_Module_Module,scp2)) $(eval $(call gb_Module_add_targets,scp2,\ + AutoInstallLibs_tde \ AutoInstallLibs_kde \ AutoInstallLibs_ooo \ AutoInstallLibs_ure \ diff --git a/scp2/source/tde/module_tde.scp b/scp2/source/tde/module_tde.scp index e302c54..2cadd97 100644 --- a/scp2/source/tde/module_tde.scp +++ b/scp2/source/tde/module_tde.scp @@ -24,6 +24,8 @@ #include macros.inc +#include AutoInstallLibs/tde + #if defined( ENABLE_TDE ) Module gid_Module_Optional_Tde ParentID = gid_Module_Optional; @@ -31,7 +33,7 @@ PackageInfo = packinfo_office.txt; MOD_NAME_DESC(MODULE_OPTIONAL_TDE); Styles = (); -Files = ( +Files = (auto_Tde_Lib_ALL #ifdef ENABLE_TDE gid_File_Lib_Tdebe #endif // ENABLE_TDE diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index ded46b9..fd395f7 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -118,7 +118,7 @@ define gb_Helper_init_registries gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTVERLIBS UNOLIBS_URE UNOVERLIBS EXTENSIONLIBS -gb_Library_VALIDINSTALLMODULES := KDE OOO URE WRITER +gb_Library_VALIDINSTALLMODULES := TDE KDE OOO URE WRITER gb_StaticLibrary_VALIDGROUPS := PLAINLIBS gb_Jar_VALIDGROUPS := URE OOO OXT NONE -- To view, visit https://gerrit.libreoffice.org/3808 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4c13d1cd4b7490a0b4db8f0dd40d823a5906c8aa Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#60924: autoinstall tde libraries
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3809 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/09/3809/1 fdo#60924: autoinstall tde libraries Change-Id: Id986bc7f9f09902dfda849bc86f9c48ccb0f30c3 --- M Repository.mk M scp2/InstallModule_tde.mk D scp2/source/tde/file_tde.scp M scp2/source/tde/module_tde.scp 4 files changed, 1 insertion(+), 43 deletions(-) diff --git a/Repository.mk b/Repository.mk index 18ce81b..a68ed5f 100644 --- a/Repository.mk +++ b/Repository.mk @@ -222,6 +222,7 @@ endif $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,TDE, \ +$(if $(ENABLE_TDE),tdebe1) \ )) $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,KDE, \ @@ -627,7 +628,6 @@ slideshow \ stringresource \ syssh \ -tdebe1 \ ucpcmis1 \ ucpext \ ucpgio1 \ diff --git a/scp2/InstallModule_tde.mk b/scp2/InstallModule_tde.mk index ad7655e..0e5dae6 100644 --- a/scp2/InstallModule_tde.mk +++ b/scp2/InstallModule_tde.mk @@ -11,15 +11,6 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/tde,tde)) -$(eval $(call gb_InstallModule_define_if_set,scp2/tde,\ - ENABLE_TDE \ - ENABLE_TDEAB \ -)) - -$(eval $(call gb_InstallModule_add_scpfiles,scp2/tde,\ -scp2/source/tde/file_tde \ -)) - $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/tde,\ scp2/source/tde/module_tde \ )) diff --git a/scp2/source/tde/file_tde.scp b/scp2/source/tde/file_tde.scp deleted file mode 100644 index 945b0de..000 --- a/scp2/source/tde/file_tde.scp +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Version: MPL 1.1 / GPLv3+ / LGPLv3+ - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the License); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an AS IS basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Initial Developer of the Original Code is - * Timothy Pearson kb9...@pearsoncomputing.net (C) 2012, All Rights Reserved. - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 3 or later (the GPLv3+), or - * the GNU Lesser General Public License Version 3 or later (the LGPLv3+), - * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable - * instead of those above. - * - / -#include macros.inc - -#ifdef ENABLE_TDE -STD_LIB_FILE( gid_File_Lib_Tdebe, tdebe1 ) -#endif diff --git a/scp2/source/tde/module_tde.scp b/scp2/source/tde/module_tde.scp index 2cadd97..d3ff16b 100644 --- a/scp2/source/tde/module_tde.scp +++ b/scp2/source/tde/module_tde.scp @@ -26,7 +26,6 @@ #include AutoInstallLibs/tde -#if defined( ENABLE_TDE ) Module gid_Module_Optional_Tde ParentID = gid_Module_Optional; Default = YES; @@ -34,10 +33,6 @@ MOD_NAME_DESC(MODULE_OPTIONAL_TDE); Styles = (); Files = (auto_Tde_Lib_ALL -#ifdef ENABLE_TDE -gid_File_Lib_Tdebe -#endif // ENABLE_TDE ); End -#endif -- To view, visit https://gerrit.libreoffice.org/3809 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id986bc7f9f09902dfda849bc86f9c48ccb0f30c3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#60924: autoinstall gnome libraries
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3813 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/13/3813/1 fdo#60924: autoinstall gnome libraries Change-Id: I0fd872d15a0c938d32aac185c3c00c5fb14a091a --- M Repository.mk M scp2/InstallModule_gnome.mk D scp2/source/gnome/file_gnome.scp M scp2/source/gnome/module_gnome.scp 4 files changed, 6 insertions(+), 94 deletions(-) diff --git a/Repository.mk b/Repository.mk index 9b8b3a4..37ccda7 100644 --- a/Repository.mk +++ b/Repository.mk @@ -222,6 +222,12 @@ endif $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,GNOME, \ +$(if $(ENABLE_EVOAB2),evoab) \ +$(if $(ENABLE_GTK),vclplug_gtk) \ +$(if $(ENABLE_GTK3),vclplug_gtk3) \ +$(if $(ENABLE_GCONF),gconfbe1) \ +$(if $(ENABLE_SYSTRAY_GTK),qstart_gtk) \ +$(if $(ENABLE_GIO),losessioninstall) \ )) $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,KDE, \ @@ -379,7 +385,6 @@ calc \ dbp \ dbu \ -evoab \ filtertracer \ flash \ graphicfilter \ @@ -391,7 +396,6 @@ placeware \ pricing \ protocolhandler \ -qstart_gtk \ rpt \ rptui \ rptxml \ @@ -410,8 +414,6 @@ textfd \ updatecheckui \ $(if $(DISABLE_SCRIPTING),,vbahelper) \ -vclplug_gtk \ -vclplug_gtk3 \ vclplug_tde \ vclplug_kde \ vclplug_kde4 \ @@ -606,12 +608,10 @@ fastsax \ fpicker \ fps_office \ -gconfbe1 \ gdipluscanvas \ hatchwindowfactory \ i18nsearch \ ldapbe2 \ -losessioninstall \ macbe1 \ migrationoo2 \ migrationoo3 \ diff --git a/scp2/InstallModule_gnome.mk b/scp2/InstallModule_gnome.mk index 3a8dd51..716cb43 100644 --- a/scp2/InstallModule_gnome.mk +++ b/scp2/InstallModule_gnome.mk @@ -11,21 +11,6 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/gnome,gnome)) -$(eval $(call gb_InstallModule_define_if_set,scp2/gnome,\ - ENABLE_EVOAB2 \ - ENABLE_GCONF \ - ENABLE_GIO \ - ENABLE_GNOMEVFS \ - ENABLE_GTK \ - ENABLE_GTK3 \ - ENABLE_LOCKDOWN \ - ENABLE_SYSTRAY_GTK \ -)) - -$(eval $(call gb_InstallModule_add_scpfiles,scp2/gnome,\ -scp2/source/gnome/file_gnome \ -)) - $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/gnome,\ scp2/source/gnome/module_gnome \ )) diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp deleted file mode 100644 index 9f824d8..000 --- a/scp2/source/gnome/file_gnome.scp +++ /dev/null @@ -1,59 +0,0 @@ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * http://www.openoffice.org/license.html - * for a copy of the LGPLv3 License. - * - / -#include macros.inc - -#ifdef ENABLE_GIO -STD_LIB_FILE( gid_File_Lib_GIO, ucpgio1 ) - -STD_LIB_FILE(gid_File_Lib_Losessioninstall, losessioninstall) -#endif - -#ifdef ENABLE_GNOMEVFS -STD_LIB_FILE( gid_File_Lib_Gnomevfs, ucpgvfs1 ) -#endif - -#if (defined ENABLE_GCONF defined ENABLE_LOCKDOWN) || defined ENABLE_GIO -File gid_File_Share_Registry_Gnome_Xcd -TXT_FILE_BODY; -Styles = (PACKED); -Dir = gid_Brand_Dir_Share_Registry; -Name = gnome.xcd; -End -#endif - -#ifdef ENABLE_GCONF -STD_LIB_FILE( gid_File_Lib_Gconfbe, gconfbe1 ) -#endif - -#ifdef ENABLE_SYSTRAY_GTK -File gid_File_Lib_QStart_Gtk -Name = LIBNAME(qstart_gtk); -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; -End -#endif diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp index b496ced..a301e21 100644 --- a/scp2/source/gnome/module_gnome.scp +++ b/scp2/source/gnome/module_gnome.scp @@ -39,28 +39,14 @@ XpdCheckSolaris = SUNWgnome-vfs; #endif Files = (auto_Gnome_lib_ALL -#ifdef ENABLE_EVOAB2 - gid_File_Lib_Evoab, -#endif #ifdef ENABLE_GTK gid_File_Lib_Fps_Gnome, - gid_File_Lib_Vclplug_Gtk, -#endif -#ifdef ENABLE_GTK3 -
[PATCH] fdo#60924 autoinstall - gbuild/scp2: add gnome module
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3812 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/12/3812/1 fdo#60924 autoinstall - gbuild/scp2: add gnome module Change-Id: I37570787815d85d30eed3b5291e1e4450e5ffd51 --- M Repository.mk A scp2/AutoInstallLibs_gnome.mk M scp2/InstallModule_gnome.mk M scp2/Module_scp2.mk M scp2/source/gnome/module_gnome.scp M solenv/gbuild/Helper.mk 6 files changed, 22 insertions(+), 2 deletions(-) diff --git a/Repository.mk b/Repository.mk index e04e7ec..9b8b3a4 100644 --- a/Repository.mk +++ b/Repository.mk @@ -221,6 +221,9 @@ endif +$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,GNOME, \ +)) + $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,KDE, \ $(if $(ENABLE_KDE),kdebe1) \ $(if $(ENABLE_KDE4),kde4be1) \ diff --git a/scp2/AutoInstallLibs_gnome.mk b/scp2/AutoInstallLibs_gnome.mk new file mode 100644 index 000..c388a29 --- /dev/null +++ b/scp2/AutoInstallLibs_gnome.mk @@ -0,0 +1,12 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_AutoInstallLibs_AutoInstallLibs,gnome,GNOME,LIBO_LIB_FILE,auto_Gnome_Lib)) + +# vim: set noet sw=4 ts=4: diff --git a/scp2/InstallModule_gnome.mk b/scp2/InstallModule_gnome.mk index 816f3b2..3a8dd51 100644 --- a/scp2/InstallModule_gnome.mk +++ b/scp2/InstallModule_gnome.mk @@ -9,6 +9,8 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/gnome)) +$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/gnome,gnome)) + $(eval $(call gb_InstallModule_define_if_set,scp2/gnome,\ ENABLE_EVOAB2 \ ENABLE_GCONF \ diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index 4173445..ca236c1 100644 --- a/scp2/Module_scp2.mk +++ b/scp2/Module_scp2.mk @@ -10,6 +10,7 @@ $(eval $(call gb_Module_Module,scp2)) $(eval $(call gb_Module_add_targets,scp2,\ + AutoInstallLibs_gnome \ AutoInstallLibs_kde \ AutoInstallLibs_ooo \ AutoInstallLibs_ure \ diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp index 3a2604d..b496ced 100644 --- a/scp2/source/gnome/module_gnome.scp +++ b/scp2/source/gnome/module_gnome.scp @@ -27,6 +27,8 @@ #include macros.inc +#include AutoInstallLibs/gnome + Module gid_Module_Optional_Gnome ParentID = gid_Module_Optional; Default = YES; @@ -36,7 +38,7 @@ #ifdef ENABLE_GNOMEVFS XpdCheckSolaris = SUNWgnome-vfs; #endif -Files = ( +Files = (auto_Gnome_lib_ALL #ifdef ENABLE_EVOAB2 gid_File_Lib_Evoab, #endif diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index ded46b9..b67c1f7 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -118,7 +118,7 @@ define gb_Helper_init_registries gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTVERLIBS UNOLIBS_URE UNOVERLIBS EXTENSIONLIBS -gb_Library_VALIDINSTALLMODULES := KDE OOO URE WRITER +gb_Library_VALIDINSTALLMODULES := GNOME KDE OOO URE WRITER gb_StaticLibrary_VALIDGROUPS := PLAINLIBS gb_Jar_VALIDGROUPS := URE OOO OXT NONE -- To view, visit https://gerrit.libreoffice.org/3812 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I37570787815d85d30eed3b5291e1e4450e5ffd51 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#60924: Move some more libs to autoinstallation
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3758 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/58/3758/1 fdo#60924: Move some more libs to autoinstallation Change-Id: I7383da4390995ad9ea2d4fb494098dab6287609f --- M Repository.mk M scp2/source/ooo/file_library_ooo.scp M scp2/source/ooo/module_hidden_ooo.scp 3 files changed, 10 insertions(+), 56 deletions(-) diff --git a/Repository.mk b/Repository.mk index d771646..84e4bff 100644 --- a/Repository.mk +++ b/Repository.mk @@ -263,6 +263,7 @@ fwk \ fwl \ fwm \ +guesslang \ $(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \ i18npool \ hyphen \ @@ -278,6 +279,9 @@ ira \ itg \ iti \ +$(if $(SOLAR_JAVA),jdbc) \ +$(if $(filter unx,$(ENABLE_KAB)),kab1) \ +$(if $(filter unx,$(ENABLE_KAB)),kabdrv1) \ localebe1 \ lng \ lnth \ @@ -290,6 +294,7 @@ offacc \ pcr \ pdffilter \ +res \ sax \ sb \ sdbt \ @@ -307,6 +312,9 @@ svx \ svxcore \ sw \ +$(if $(filter unx,$(ENABLE_TDEAB)),tdeab1) \ +$(if $(filter unx,$(ENABLE_TDEAB)),tdeabdrv1) \ +textconversiondlgs \ tk \ tl \ $(if $(ENABLE_TELEPATHY),tubes) \ @@ -316,6 +324,7 @@ utl \ uui \ vcl \ +$(if $(filter unx,$(if $(filter MACOSX,,$(if $(filter LIBO_HEADLESS),vclplug_gen) \ xmlscript \ xmlfa \ xmlfd \ @@ -362,10 +371,6 @@ filtertracer \ flash \ graphicfilter \ -guesslang \ - jdbc \ - kab1 \ - kabdrv1 \ log \ MacOSXSpell \ mork \ @@ -375,7 +380,6 @@ pricing \ protocolhandler \ qstart_gtk \ -res \ rpt \ rptui \ rptxml \ @@ -391,13 +395,9 @@ spell \ sts \ svgfilter \ - tdeab1 \ - tdeabdrv1 \ -textconversiondlgs \ textfd \ updatecheckui \ $(if $(DISABLE_SCRIPTING),,vbahelper) \ -vclplug_gen \ vclplug_gtk \ vclplug_gtk3 \ vclplug_tde \ diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index b9155e2..2c51db4 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -310,16 +310,6 @@ #ifdef UNX -#ifdef ENABLE_KAB -STD_LIB_FILE(gid_File_Lib_Kab_1, kab1) -STD_LIB_FILE(gid_File_Lib_Kab_Drv_1, kabdrv1) -#endif - -#ifdef ENABLE_TDEAB -STD_LIB_FILE(gid_File_Lib_Tdeab_1, tdeab1) -STD_LIB_FILE(gid_File_Lib_Tdeab_Drv_1, tdeabdrv1) -#endif - #ifdef MACOSX File gid_File_Lib_Macab_1 LIB_FILE_BODY; @@ -540,13 +530,6 @@ #endif - -#ifdef SOLAR_JAVA - -STD_LIB_FILE( gid_File_Lib_Jdbc, jdbc) - -#endif - #ifdef SOLAR_JAVA File gid_File_Lib_Hsqldb_2 LIB_FILE_BODY; @@ -674,15 +657,6 @@ STD_LIB_FILE( gid_File_Lib_Pl , pl) #endif -#if defined(UNX) ! defined(MACOSX) ! defined(LIBO_HEADLESS) -File gid_File_Lib_Vclplug_Gen -Name = LIBNAME(vclplug_gen); -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; -End -#endif - #if defined(UNX) ! defined(MACOSX) #ifdef ENABLE_GTK File gid_File_Lib_Vclplug_Gtk @@ -794,13 +768,6 @@ #endif /* WNT HAVE_WINDOWS_SDK */ -File gid_File_Lib_Res -Name = LIBNAME(res); -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; -End - STD_LIB_FILE( gid_File_Lib_Expwrap_Uno, expwrap ) STD_LIB_FILE( gid_File_Lib_Fastsax_Uno, fastsax ) @@ -858,8 +825,6 @@ #endif SPECIAL_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1) - -STD_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs) #if ! defined UNX File gid_File_Lib_Sysdtrans @@ -1070,8 +1035,6 @@ STD_LIB_FILE( gid_File_Lib_Migrationoo2, migrationoo2 ) STD_LIB_FILE( gid_File_Lib_Migrationoo3, migrationoo3 ) - -STD_LIB_FILE( gid_File_Lib_Guesslang, guesslang ) STD_LIB_FILE( gid_File_Lib_Updatefeed , updatefeed ) diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 4bc068c..4fa30ae 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -162,22 +162,18 @@ gid_File_Lib_Oox, gid_File_Lib_Pl, gid_File_Lib_Sf_Prothdlr, - gid_File_Lib_Res, gid_File_Lib_Spa, gid_File_Lib_AVMediaWin, gid_File_Lib_AVMediaGStreamer, gid_File_Lib_AVMediaGStreamer_0_10, gid_File_Lib_Sysdtrans, - gid_File_Lib_TextConversionDlgs, gid_File_Lib_Acc, gid_File_Lib_BaseBmp, gid_File_Lib_Zip, - gid_File_Lib_Vclplug_Gen, gid_File_Lib_Vclplug_Tde, gid_File_Lib_Vclplug_Kde, gid_File_Lib_Vclplug_Kde4, - gid_File_Lib_Vclplug_Svp, - gid_File_Lib_Guesslang); + gid_File_Lib_Vclplug_Svp); End Module gid_Module_Root_Files_5 @@ -209,10 +205,6 @@ gid_File_Lib_Dbpool, gid_File_Lib_Embobj, gid_File_Lib_Emboleobj, - gid_File_Lib_Tdeab_1, -gid_File_Lib_Tdeab_Drv_1,
[PATCH] fdo#63154: Remove _CL and _LF from solar.h
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3740
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/40/3740/1
fdo#63154: Remove _CL and _LF from solar.h
And use RTL_CHAR_{CR,LF} from rtl/string.h
Change-Id: I05b0325006845e48eb5483485a9042aa7b0cd22a
---
M include/rtl/string.h
M include/tools/solar.h
M sc/source/core/tool/formularesult.cxx
M sc/source/filter/html/htmlexp.cxx
M sc/source/ui/docshell/docsh.cxx
M sc/source/ui/docshell/impex.cxx
M svl/source/items/slstitm.cxx
M svtools/source/svhtml/parhtml.cxx
M sw/source/filter/html/htmlform.cxx
M sw/source/filter/html/swhtml.cxx
M sw/source/ui/misc/redlndlg.cxx
M tools/source/generic/config.cxx
M tools/source/stream/stream.cxx
M vcl/source/app/dbggui.cxx
M vcl/source/control/edit.cxx
M vcl/source/gdi/outdev3.cxx
M vcl/source/gdi/pdfwriter_impl.cxx
M vcl/source/window/status.cxx
18 files changed, 65 insertions(+), 66 deletions(-)
diff --git a/include/rtl/string.h b/include/rtl/string.h
index 93cffa1..e9825d4 100644
--- a/include/rtl/string.h
+++ b/include/rtl/string.h
@@ -31,6 +31,9 @@
extern C {
#endif
+#define RTL_CHAR_CR ('\x0D')
+#define RTL_CHAR_LF ('\x0A')
+
/* === */
/** Return the length of a string.
diff --git a/include/tools/solar.h b/include/tools/solar.h
index 7ef683f..0645a61 100644
--- a/include/tools/solar.h
+++ b/include/tools/solar.h
@@ -107,9 +107,6 @@
#endif
#endif
-#define _LF ((char)0x0A)
-#define _CR ((char)0x0D)
-
// pragmas
#if defined _MSC_VER
diff --git a/sc/source/core/tool/formularesult.cxx
b/sc/source/core/tool/formularesult.cxx
index c044ec1..01d00c7 100644
--- a/sc/source/core/tool/formularesult.cxx
+++ b/sc/source/core/tool/formularesult.cxx
@@ -261,7 +261,7 @@
if (meMultiline == MULTILINE_UNKNOWN)
{
const String rStr = GetString();
-if (rStr.Len() rStr.Search( _LF ) != STRING_NOTFOUND)
+if (rStr.Len() rStr.Search( RTL_CHAR_LF ) != STRING_NOTFOUND)
const_castScFormulaResult*(this)-meMultiline = MULTILINE_TRUE;
else
const_castScFormulaResult*(this)-meMultiline = MULTILINE_FALSE;
diff --git a/sc/source/filter/html/htmlexp.cxx
b/sc/source/filter/html/htmlexp.cxx
index 1517c81..9b988be 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -1159,7 +1159,7 @@
else
{
String aStr = aStrOut;
-xub_StrLen nPos = aStr.Search( _LF );
+xub_StrLen nPos = aStr.Search( RTL_CHAR_LF );
if ( nPos == STRING_NOTFOUND )
{
OUT_STR( aStrOut );
@@ -1174,7 +1174,7 @@
TAG_ON( OOO_STRING_SVTOOLS_HTML_linebreak );
nStartPos = nPos + 1;
}
-while( ( nPos = aStr.Search( _LF, nStartPos ) ) !=
STRING_NOTFOUND );
+while( ( nPos = aStr.Search( RTL_CHAR_LF, nStartPos ) ) !=
STRING_NOTFOUND );
String aSingleLine( aStr, nStartPos, aStr.Len() - nStartPos );
OUT_STR( aSingleLine );
}
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index c99ca76..5e20522 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -1759,7 +1759,7 @@
sal_Int32 nPos = rStr.indexOf(rTextSep);
rNeedQuotes = rAsciiOpt.bQuoteAllText || (nPos = 0) ||
(rStr.indexOf(rFieldSep) = 0) ||
-(rStr.indexOf(sal_Unicode(_LF)) = 0);
+(rStr.indexOf(sal_Unicode(RTL_CHAR_LF)) = 0);
return nPos;
}
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index b6c4869..8dc1b90 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -528,13 +528,13 @@
switch ( rStrm.GetLineDelimiter() )
{
case LINEEND_CR :
-rStrm sal_Unicode(_CR);
+rStrm sal_Unicode(RTL_CHAR_CR);
break;
case LINEEND_LF :
-rStrm sal_Unicode(_LF);
+rStrm sal_Unicode(RTL_CHAR_LF);
break;
default:
-rStrm sal_Unicode(_CR) sal_Unicode(_LF);
+rStrm sal_Unicode(RTL_CHAR_CR) sal_Unicode(RTL_CHAR_LF);
}
}
else
@@ -727,7 +727,7 @@
else
rString.SearchAndReplaceAll( OUString(DOUBLE_DOUBLEQUOTE),
OUString('') );
-rString.SearchAndReplaceAll( OUString(SYLK_LF), OUString(_LF) );
+rString.SearchAndReplaceAll( OUString(SYLK_LF), OUString(RTL_CHAR_LF) );
}
static const sal_Unicode* lcl_ScanSylkString( const sal_Unicode* p,
@@ -1196,7 +1196,7 @@
}
// Standard or date not determined - SetString / EditCell
-if( rStr.Search( _LF ) == STRING_NOTFOUND )
+if( rStr.Search( RTL_CHAR_LF ) == STRING_NOTFOUND )
{
ScSetStringParam aParam;
[PATCH] fdo#60949: Remove last UNOLIBS_OOO
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3682 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/82/3682/1 fdo#60949: Remove last UNOLIBS_OOO Change-Id: I79af32f188a0e7de71ec8e6743fe73b3bb030a3f --- M Repository.mk 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/Repository.mk b/Repository.mk index 296ffc8..76d6662 100644 --- a/Repository.mk +++ b/Repository.mk @@ -225,6 +225,7 @@ chartcore \ chartcontroller \ cppcanvas \ +configmgr \ ctl \ cui \ dba \ @@ -232,8 +233,9 @@ dbmm \ $(if $(DISABLE_DBCONNECTIVITY),,dbtools) \ dbaxml \ - deploymentmisc \ - $(if $(filter unx,$(GUIBASE)),desktop_detector) \ +deploymentmisc \ +$(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \ +$(if $(filter unx,$(GUIBASE)),desktop_detector) \ drawinglayer \ editeng \ egi \ @@ -252,12 +254,14 @@ for \ forui \ frm \ +fsstorage \ fwe \ fwi \ fwk \ fwl \ fwm \ $(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \ +i18npool \ icd \ icg \ idx \ @@ -270,6 +274,7 @@ ira \ itg \ iti \ +localebe1 \ lng \ $(if $(MERGELIBS),merged) \ msfilter \ @@ -289,6 +294,7 @@ tk \ tl \ $(if $(ENABLE_TELEPATHY),tubes) \ +ucpexpand1 \ unordf \ unoxml \ utl \ @@ -632,15 +638,6 @@ smplmail \ wininetbe1 \ ) \ -)) - -$(eval $(call gb_Helper_register_libraries_for_install,UNOLIBS_OOO,OOO, \ - configmgr \ - $(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \ - fsstorage \ - i18npool \ - localebe1 \ - ucpexpand1 \ )) $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \ -- To view, visit https://gerrit.libreoffice.org/3682 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I79af32f188a0e7de71ec8e6743fe73b3bb030a3f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#60924: Move more libs to autoinstallation
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3689 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/89/3689/1 fdo#60924: Move more libs to autoinstallation Change-Id: I5c136760ca59278ba6bfcd1d11c56d810e9cfa76 --- M Repository.mk M scp2/source/ooo/file_library_ooo.scp M scp2/source/ooo/module_hidden_ooo.scp 3 files changed, 40 insertions(+), 88 deletions(-) diff --git a/Repository.mk b/Repository.mk index 296ffc8..a5a13e0 100644 --- a/Repository.mk +++ b/Repository.mk @@ -218,8 +218,11 @@ endif $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ +abp \ +analysis \ avmedia \ $(if $(DISABLE_SCRIPTING),,basctl) \ +basegfx \ bib \ canvastools \ chartcore \ @@ -232,6 +235,8 @@ dbmm \ $(if $(DISABLE_DBCONNECTIVITY),,dbtools) \ dbaxml \ +dbp \ +dbu \ deploymentmisc \ $(if $(filter unx,$(GUIBASE)),desktop_detector) \ drawinglayer \ @@ -246,7 +251,9 @@ ept \ era \ eti \ +evtatt \ exp \ +flat \ file \ filterconfig \ for \ @@ -258,6 +265,7 @@ fwl \ fwm \ $(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \ +hyphen \ icd \ icg \ idx \ @@ -271,14 +279,38 @@ itg \ iti \ lng \ +lnth \ +log \ $(if $(MERGELIBS),merged) \ msfilter \ +mysql \ +odbc \ odbcbase \ +odfflatxml \ +offacc \ +oox \ +pcr \ +pdffilter \ +pricing \ +rpt \ +rptui \ +rptxml \ sax \ sb \ sdbt \ +sc \ +scd \ +scfilt \ +scui \ +scn \ +sd \ +sdd \ sdfilt \ +sdui \ sfx \ +sm \ +smd \ +solver \ sot \ $(if $(ENABLE_HEADLESS),,spl) \ svgio \ @@ -286,6 +318,9 @@ svt \ svx \ svxcore \ +sw \ +textconversiondlgs \ +textfd \ tk \ tl \ $(if $(ENABLE_TELEPATHY),tubes) \ @@ -295,7 +330,12 @@ uui \ vcl \ xmlscript \ +xmlfa \ +xmlfd \ xo \ +xof \ +xsltdlg \ +xsltfilter \ )) $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,WRITER, \ @@ -310,80 +350,45 @@ )) $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ -abp \ acc \ adabas \ adabasui \ ado \ agg \ -analysis \ animcore \ $(if $(filter $(OS),ANDROID),, \ basebmp \ ) \ communi \ date \ -evtatt \ -odbc \ -oox \ ooxml \ sdbc \ AppleRemote \ avmediaQuickTime \ -basegfx \ calc \ -dbp \ -dbu \ evoab \ filtertracer \ flash \ - flat \ graphicfilter \ guesslang \ -hyphen \ jdbc \ kab1 \ kabdrv1 \ -lnth \ -log \ MacOSXSpell \ mork \ mozab2 \ mozabdrv \ - mysql \ -odfflatxml \ -offacc \ -pcr \ -pdffilter \ placeware \ -pricing \ protocolhandler \ qstart_gtk \ res \ -rpt \ -rptui \ -rptxml \ -sc \ -scd \ -scfilt \ -scn \ -scui \ -sd \ -sdd \ -sdui \ simplecm \ -sm \ -smd \ -solver \ spa \ spell \ sts \ svgfilter \ -sw \ tdeab1 \ tdeabdrv1 \ -textconversiondlgs \ -textfd \ updatecheckui \ $(if $(DISABLE_SCRIPTING),,vbahelper) \ vclplug_gen \ @@ -394,11 +399,6 @@ vclplug_kde4 \ vclplug_svp \ wpftdraw \ -xmlfa \ -xmlfd \ -xof \ -xsltdlg \ -xsltfilter \ )) ifneq (,$(filter ANDROID IOS,$(OS))) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index ab3105e..5985728d 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -645,12 +645,7 @@ #endif -STD_LIB_FILE(gid_File_Lib_Mysql,mysql) -STD_LIB_FILE(gid_File_Lib_Odbc,odbc) - // STD_LIB_FILE( gid_File_Lib_Ofa , ofa) - -STD_LIB_FILE( gid_File_Lib_Offacc, offacc) #ifdef SOLAR_JAVA #ifndef MACOSX @@ -674,12 +669,6 @@ #endif STD_LIB_FILE( gid_File_Lib_Passwordcontainer, passwordcontainer ) - -STD_LIB_FILE( gid_File_Lib_Pcr, pcr) - -STD_LIB_FILE( gid_File_Lib_Log, log) - -STD_LIB_FILE( gid_File_Lib_Pdffilter, pdffilter) SPECIAL_LIB_FILE(gid_File_Lib_DeploymentGui,deploymentgui) @@ -977,28 +966,7 @@ STD_LIB_FILE(gid_File_Ucpcmis, ucpcmis1) -File gid_File_Lib_Lnth -LIB_FILE_BODY; -Styles = (PACKED); -Name = LIBNAME(lnth); -Dir = SCP2_OOO_BIN_DIR; -End - -File gid_File_Lib_Hyph -LIB_FILE_BODY; -Styles = (PACKED); -Name = LIBNAME(hyphen); -Dir = SCP2_OOO_BIN_DIR; -End - -STD_LIB_FILE( gid_File_Lib_BaseGfx, basegfx ) -STD_LIB_FILE( gid_File_Lib_Xof, xof) -STD_LIB_FILE( gid_File_Lib_Xsltdlg, xsltdlg ) -STD_LIB_FILE( gid_File_Lib_Xsltfilter, xsltfilter ) -STD_LIB_FILE( gid_File_Lib_Xmlfa, xmlfa )
[PATCH] fdo#60924: Move some libs to autoinstallation
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3630 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/30/3630/1 fdo#60924: Move some libs to autoinstallation Change-Id: I58421587784260bd88994926bca031ab26a6214f --- M Repository.mk M scp2/source/ooo/file_ooo.scp 2 files changed, 24 insertions(+), 74 deletions(-) diff --git a/Repository.mk b/Repository.mk index 6a0e297..60c0170 100644 --- a/Repository.mk +++ b/Repository.mk @@ -236,7 +236,17 @@ $(if $(filter unx,$(GUIBASE)),desktop_detector) \ drawinglayer \ editeng \ +egi \ +eme \ $(if $(filter WNT,$(OS)),$(if $(DISABLE_ATL),,emser)) \ +epb \ +epg \ +epp \ +eps \ +ept \ +era \ +eti \ +exp \ file \ filterconfig \ for \ @@ -248,6 +258,18 @@ fwl \ fwm \ $(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \ +icd \ +icg \ +idx \ +ime \ +ipb \ +ipd \ +ips \ +ipt \ +ipx \ +ira \ +itg \ +iti \ lng \ $(if $(MERGELIBS),merged) \ msfilter \ @@ -255,9 +277,11 @@ sax \ sb \ sdbt \ +sdfilt \ sfx \ sot \ $(if $(ENABLE_HEADLESS),,spl) \ +svgio \ svl \ svt \ svx \ @@ -310,35 +334,13 @@ calc \ dbp \ dbu \ -egi \ -eme \ -epb \ -epg \ -epp \ -eps \ -ept \ -era \ -eti \ evoab \ -exp \ filtertracer \ flash \ flat \ graphicfilter \ guesslang \ hyphen \ - icd \ - icg \ - idx \ - ime \ - ipb \ - ipd \ - ips \ - ipt \ - ipx \ - ira \ - itg \ - iti \ jdbc \ kab1 \ kabdrv1 \ @@ -368,7 +370,6 @@ scui \ sd \ sdd \ -sdfilt \ sdui \ simplecm \ sm \ @@ -378,7 +379,6 @@ spell \ sts \ svgfilter \ - svgio \ sw \ tdeab1 \ tdeabdrv1 \ diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 1b3dd8a..0eb299e 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -347,56 +347,6 @@ Name = toolbar.dtd; End -STD_LIB_FILE( gid_File_Filter_Sdfilt, sdfilt) - -STD_LIB_FILE( git_File_Filter_Svgio, svgio) - -STD_LIB_FILE( gid_File_Filter_Eme, eme) - -STD_LIB_FILE( gid_File_Filter_Icg, icg) - -STD_LIB_FILE( gid_File_Filter_Egi, egi) - -STD_LIB_FILE( gid_File_Filter_Epb, epb) - -STD_LIB_FILE( gid_File_Filter_Epg, epg) - -STD_LIB_FILE( gid_File_Filter_Epp, epp) - -STD_LIB_FILE( gid_File_Filter_Eps, eps) - -STD_LIB_FILE( gid_File_Filter_Ept, ept) - -STD_LIB_FILE( gid_File_Filter_Era, era) - -STD_LIB_FILE( gid_File_Filter_Eti, eti) - -STD_LIB_FILE( gid_File_Filter_Exp, exp) - -STD_LIB_FILE( gid_File_Filter_Icd, icd) - -STD_LIB_FILE( gid_File_Filter_Idx, idx) - -STD_LIB_FILE( gid_File_Filter_Ime, ime) - -STD_LIB_FILE( gid_File_Filter_Ipb, ipb) - -STD_LIB_FILE( gid_File_Filter_Ipd, ipd) - -STD_LIB_FILE( gid_File_Filter_Ips, ips) - -STD_LIB_FILE( gid_File_Filter_Ipt, ipt) - -STD_LIB_FILE( gid_File_Filter_Ipx, ipx) - -STD_LIB_FILE( gid_File_Filter_Ira, ira) - -STD_LIB_FILE( gid_File_Filter_Itg, itg) - -STD_LIB_FILE( gid_File_Filter_Iti, iti) - -STD_RES_FILE( gid_File_Res_Eps, eps ) - File gid_File_Help_Help_Zip Dir = gid_Dir_Help; ARCHIVE_TXT_FILE_BODY; -- To view, visit https://gerrit.libreoffice.org/3630 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I58421587784260bd88994926bca031ab26a6214f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#60924: Move some libs to autoinstallation
Hello LibreOffice gerrit bot, Matúš Kukan, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/3630 to look at the new patch set (#2). Change subject: fdo#60924: Move some libs to autoinstallation .. fdo#60924: Move some libs to autoinstallation Change-Id: I58421587784260bd88994926bca031ab26a6214f --- M Repository.mk M scp2/source/ooo/file_ooo.scp M scp2/source/ooo/module_hidden_ooo.scp 3 files changed, 24 insertions(+), 95 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/30/3630/2 -- To view, visit https://gerrit.libreoffice.org/3630 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I58421587784260bd88994926bca031ab26a6214f Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Matúš Kukan matus.ku...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#63154: Remove all usages of the macro EXTERN_C
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3621
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/21/3621/1
fdo#63154: Remove all usages of the macro EXTERN_C
Change-Id: I25b7f509ba5d1007a16c84ad05870a8174c094ec
---
M embedserv/source/inc/embservconst.h
M include/tools/solar.h
M lotuswordpro/source/filter/lwpfilter.hxx
M sal/systools/win32/uwinapi/legacy.c
M sfx2/source/control/dispatch.cxx
M sfx2/source/control/objface.cxx
6 files changed, 23 insertions(+), 31 deletions(-)
diff --git a/embedserv/source/inc/embservconst.h
b/embedserv/source/inc/embservconst.h
index 7c876a6..6dac501 100644
--- a/embedserv/source/inc/embservconst.h
+++ b/embedserv/source/inc/embservconst.h
@@ -31,35 +31,35 @@
#define SUPPORTED_FACTORIES_NUM 10
#if defined(__MINGW32__) !defined(INITGUID)
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_WriterTextServer;
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_WriterOASISTextServer;
+extern C const GUID DECLSPEC_SELECTANY OID_WriterTextServer;
+extern C const GUID DECLSPEC_SELECTANY OID_WriterOASISTextServer;
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_CalcServer;
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_CalcOASISServer;
+extern C const GUID DECLSPEC_SELECTANY OID_CalcServer;
+extern C const GUID DECLSPEC_SELECTANY OID_CalcOASISServer;
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_DrawingServer;
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_DrawingOASISServer;
+extern C const GUID DECLSPEC_SELECTANY OID_DrawingServer;
+extern C const GUID DECLSPEC_SELECTANY OID_DrawingOASISServer;
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_PresentationServer;
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_PresentationOASISServer;
+extern C const GUID DECLSPEC_SELECTANY OID_PresentationServer;
+extern C const GUID DECLSPEC_SELECTANY OID_PresentationOASISServer;
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_MathServer;
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_MathOASISServer;
+extern C const GUID DECLSPEC_SELECTANY OID_MathServer;
+extern C const GUID DECLSPEC_SELECTANY OID_MathOASISServer;
#else
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_WriterTextServer = {
SO3_SW_OLE_EMBED_CLASSID_60 };
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_WriterOASISTextServer = {
SO3_SW_OLE_EMBED_CLASSID_8 };
+extern C const GUID DECLSPEC_SELECTANY OID_WriterTextServer = {
SO3_SW_OLE_EMBED_CLASSID_60 };
+extern C const GUID DECLSPEC_SELECTANY OID_WriterOASISTextServer = {
SO3_SW_OLE_EMBED_CLASSID_8 };
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_CalcServer = {
SO3_SC_OLE_EMBED_CLASSID_60 };
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_CalcOASISServer = {
SO3_SC_OLE_EMBED_CLASSID_8 };
+extern C const GUID DECLSPEC_SELECTANY OID_CalcServer = {
SO3_SC_OLE_EMBED_CLASSID_60 };
+extern C const GUID DECLSPEC_SELECTANY OID_CalcOASISServer = {
SO3_SC_OLE_EMBED_CLASSID_8 };
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_DrawingServer = {
SO3_SDRAW_OLE_EMBED_CLASSID_60 };
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_DrawingOASISServer = {
SO3_SDRAW_OLE_EMBED_CLASSID_8 };
+extern C const GUID DECLSPEC_SELECTANY OID_DrawingServer = {
SO3_SDRAW_OLE_EMBED_CLASSID_60 };
+extern C const GUID DECLSPEC_SELECTANY OID_DrawingOASISServer = {
SO3_SDRAW_OLE_EMBED_CLASSID_8 };
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_PresentationServer = {
SO3_SIMPRESS_OLE_EMBED_CLASSID_60 };
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_PresentationOASISServer = {
SO3_SIMPRESS_OLE_EMBED_CLASSID_8 };
+extern C const GUID DECLSPEC_SELECTANY OID_PresentationServer = {
SO3_SIMPRESS_OLE_EMBED_CLASSID_60 };
+extern C const GUID DECLSPEC_SELECTANY OID_PresentationOASISServer = {
SO3_SIMPRESS_OLE_EMBED_CLASSID_8 };
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_MathServer = {
SO3_SM_OLE_EMBED_CLASSID_60 };
-EXTERN_C const GUID DECLSPEC_SELECTANY OID_MathOASISServer = {
SO3_SM_OLE_EMBED_CLASSID_8 };
+extern C const GUID DECLSPEC_SELECTANY OID_MathServer = {
SO3_SM_OLE_EMBED_CLASSID_60 };
+extern C const GUID DECLSPEC_SELECTANY OID_MathOASISServer = {
SO3_SM_OLE_EMBED_CLASSID_8 };
#endif
#endif
diff --git a/include/tools/solar.h b/include/tools/solar.h
index 58d5849..7ef683f 100644
--- a/include/tools/solar.h
+++ b/include/tools/solar.h
@@ -107,12 +107,6 @@
#endif
#endif
-#ifdef __cplusplus
-#define EXTERN_Cextern C
-#else
-#define EXTERN_C
-#endif
-
#define _LF ((char)0x0A)
#define _CR ((char)0x0D)
diff --git a/lotuswordpro/source/filter/lwpfilter.hxx
b/lotuswordpro/source/filter/lwpfilter.hxx
index 3c058ec..ed57baf 100644
--- a/lotuswordpro/source/filter/lwpfilter.hxx
+++ b/lotuswordpro/source/filter/lwpfilter.hxx
@@ -86,8 +86,6 @@
using namespace ::com::sun::star::text;
using namespace ::com::sun::star;
-#define EXTERN_C extern C
-
/**
* @brief
* Implements the XFilter interface.
diff --git a/sal/systools/win32/uwinapi/legacy.c
b/sal/systools/win32/uwinapi/legacy.c
index ec0b80a..777df2b 100644
---
[PATCH] fdo#60949: Remove UNOLIBS_OOO
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3626 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/26/3626/1 fdo#60949: Remove UNOLIBS_OOO By removing the last two libs: nullcanvas and directx5canvas. directx5canvas seems to be dead and nullcanvas don't have entries in scp2. Change-Id: Ib8fc1da123f8374fb83192f14db730638213f564 --- M Repository.mk D canvas/Library_nullcanvas.mk M canvas/Module_canvas.mk 3 files changed, 0 insertions(+), 65 deletions(-) diff --git a/Repository.mk b/Repository.mk index 6a0e297..f20519e 100644 --- a/Repository.mk +++ b/Repository.mk @@ -642,10 +642,6 @@ localebe1 \ ucpexpand1 \ )) -$(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ -directx5canvas \ -nullcanvas \ -)) $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \ testtools_cppobj \ diff --git a/canvas/Library_nullcanvas.mk b/canvas/Library_nullcanvas.mk deleted file mode 100644 index 863696f..000 --- a/canvas/Library_nullcanvas.mk +++ /dev/null @@ -1,60 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -#* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2011 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# http://www.openoffice.org/license.html -# for a copy of the LGPLv3 License. -# -#* - -$(eval $(call gb_Library_Library,nullcanvas)) - -$(eval $(call gb_Library_set_componentfile,nullcanvas,canvas/source/null/nullcanvas)) - -$(eval $(call gb_Library_use_external,nullcanvas,boost_headers)) - -$(eval $(call gb_Library_use_sdk_api,nullcanvas)) - -$(eval $(call gb_Library_use_libraries,nullcanvas,\ - basegfx \ - canvastools \ - comphelper \ - cppu \ - cppuhelper \ - sal \ - vcl \ - $(gb_UWINAPI) \ -)) - -$(eval $(call gb_Library_add_exception_objects,nullcanvas,\ - canvas/source/null/null_canvasbitmap \ - canvas/source/null/null_canvascustomsprite \ - canvas/source/null/null_canvasfont \ - canvas/source/null/null_canvashelper \ - canvas/source/null/null_devicehelper \ - canvas/source/null/null_spritecanvas \ - canvas/source/null/null_spritecanvashelper \ - canvas/source/null/null_spritehelper \ - canvas/source/null/null_textlayout \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/canvas/Module_canvas.mk b/canvas/Module_canvas.mk index a678faf..59acf96 100644 --- a/canvas/Module_canvas.mk +++ b/canvas/Module_canvas.mk @@ -31,7 +31,6 @@ $(eval $(call gb_Module_add_targets,canvas,\ Library_canvasfactory \ Library_canvastools \ - Library_nullcanvas \ Library_simplecanvas \ Library_vclcanvas \ )) -- To view, visit https://gerrit.libreoffice.org/3626 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib8fc1da123f8374fb83192f14db730638213f564 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#60949: Move the last libs to OOOLIBS
Hello LibreOffice gerrit bot, Matúš Kukan, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/3561 to look at the new patch set (#3). Change subject: fdo#60949: Move the last libs to OOOLIBS .. fdo#60949: Move the last libs to OOOLIBS Change-Id: Ieec4edf41140f9c5af3dcc227c917b06157a26f3 --- M Repository.mk M scp2/source/base/postgresqlsdbc.scp M scp2/source/canvas/canvascommons.scp M scp2/source/canvas/directxcanvas.scp M scp2/source/canvas/vclcanvas.scp M scp2/source/gnome/file_gnome.scp M scp2/source/ooo/file_library_ooo.scp M scp2/source/ooo/module_pdfimport.scp 8 files changed, 52 insertions(+), 77 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/61/3561/3 -- To view, visit https://gerrit.libreoffice.org/3561 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ieec4edf41140f9c5af3dcc227c917b06157a26f3 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Björn Michaelsen bjoern.michael...@canonical.com Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Matúš Kukan matus.ku...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#63154: Removed all usages of SVLIBRARY
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3574
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/74/3574/1
fdo#63154: Removed all usages of SVLIBRARY
Change-Id: Ib1b6ba1220657343a264525d1cb55138e481f4fd
---
M connectivity/source/drivers/mozab/MDriver.cxx
M connectivity/source/drivers/mozab/MServices.cxx
M connectivity/workben/testmoz/main.cxx
M sc/source/ui/attrdlg/scabstdlg.cxx
M sc/source/ui/docshell/impex.cxx
M sd/source/filter/sdfilter.cxx
M sfx2/source/appl/app.cxx
M sfx2/source/appl/appinit.cxx
M sfx2/source/appl/appserv.cxx
M svtools/source/misc/svtaccessiblefactory.cxx
M svx/source/form/dbtoolsclient.cxx
M sw/source/filter/basflt/fltini.cxx
M sw/source/ui/dbui/swdbtoolsclient.cxx
M toolkit/source/helper/accessibilityclient.cxx
M tools/inc/tools/solar.h
M vcl/source/filter/FilterConfigCache.cxx
16 files changed, 20 insertions(+), 41 deletions(-)
diff --git a/connectivity/source/drivers/mozab/MDriver.cxx
b/connectivity/source/drivers/mozab/MDriver.cxx
index 1e56e71..a924944 100644
--- a/connectivity/source/drivers/mozab/MDriver.cxx
+++ b/connectivity/source/drivers/mozab/MDriver.cxx
@@ -24,7 +24,6 @@
#include resource/mozab_res.hrc
#include resource/common_res.hrc
-#include tools/solar.h
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::beans;
@@ -148,7 +147,7 @@
::connectivity::SharedResources aResources;
const OUString sError( aResources.getResourceStringWithSubstitution(
STR_COULD_NOT_LOAD_LIB,
-$libname$, OUString( SVLIBRARY( mozabdrv ) )
+$libname$, OUString( SAL_MODULENAME( mozabdrv lo ) )
) );
::dbtools::throwGenericSQLException(sError,*this);
@@ -293,7 +292,7 @@
OSL_ENSURE(NULL == m_pCreationFunc, MozabDriver::ensureInit:
inconsistence: already have a factory function!);
-const OUString sModuleName(SVLIBRARY( mozabdrv ));
+const OUString sModuleName(SAL_MODULENAME( mozabdrv lo ));
// load the mozabdrv library
m_hModule = osl_loadModuleRelative(thisModule, sModuleName.pData, 0);
diff --git a/connectivity/source/drivers/mozab/MServices.cxx
b/connectivity/source/drivers/mozab/MServices.cxx
index 48e867b..99bfebe 100644
--- a/connectivity/source/drivers/mozab/MServices.cxx
+++ b/connectivity/source/drivers/mozab/MServices.cxx
@@ -23,7 +23,6 @@
#include osl/diagnose.h
#include com/sun/star/mozilla/XMozillaBootstrap.hpp
#include bootstrap/MMozillaBootstrap.hxx
-#include tools/solar.h
using namespace connectivity::mozab;
using ::com::sun::star::uno::Reference;
@@ -83,7 +82,7 @@
typedef void* (SAL_CALL * OMozillaBootstrap_CreateInstanceFunction)(const
Reference XMultiServiceFactory _rxFactory );
::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface
SAL_CALL createMozillaBootstrap(const ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory _rxFactory) throw(
::com::sun::star::uno::Exception )
{
-const OUString sModuleName(SVLIBRARY( mozabdrv ));
+const OUString sModuleName(SAL_MODULENAME( mozabdrv lo ));
// load the dbtools library
oslModule s_hModule = osl_loadModuleRelative(
diff --git a/connectivity/workben/testmoz/main.cxx
b/connectivity/workben/testmoz/main.cxx
index a5d251c..9044634 100644
--- a/connectivity/workben/testmoz/main.cxx
+++ b/connectivity/workben/testmoz/main.cxx
@@ -154,7 +154,7 @@
, sdbc2 SAL_DLLEXTENSION
, dbpool2 SAL_DLLEXTENSION
#ifdef SAL_UNX
-, SVLIBRARY( dtransX11 )// OBR
+, SAL_MODULENAME( dtransX11 lo )// OBR
#endif
#ifdef SAL_W32
, SAL_MODULENAME( sysdtrans )
diff --git a/sc/source/ui/attrdlg/scabstdlg.cxx
b/sc/source/ui/attrdlg/scabstdlg.cxx
index 10be258..ff06994 100644
--- a/sc/source/ui/attrdlg/scabstdlg.cxx
+++ b/sc/source/ui/attrdlg/scabstdlg.cxx
@@ -42,10 +42,9 @@
ScFuncPtrCreateDialogFactory fp = 0;
static ::osl::Module aDialogLibrary;
-OUStringBuffer aStrBuf;
-aStrBuf.appendAscii( SVLIBRARY(scui) );
+OUString aStrBuf( SAL_MODULENAME(scui lo) );
-if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( thisModule,
aStrBuf.makeStringAndClear(),
+if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( thisModule,
aStrBuf,
SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) )
fp = ( ScAbstractDialogFactory* (SAL_CALL*)() )
aDialogLibrary.getFunctionSymbol( OUString(CreateDialogFactory)
);
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index b6c4869..d12aeef 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -2260,7 +2260,7 @@
return *plugin;
#ifndef DISABLE_DYNLOADING
-OUString sFilterLib(SVLIBRARY(scfilt));
+OUString sFilterLib(SAL_MODULENAME(scfilt lo));
static
[PATCH] fdo#60949: Move the last libs to OOOLIBS
Hello LibreOffice gerrit bot, Matúš Kukan, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/3561 to look at the new patch set (#2). Change subject: fdo#60949: Move the last libs to OOOLIBS .. fdo#60949: Move the last libs to OOOLIBS Change-Id: Ieec4edf41140f9c5af3dcc227c917b06157a26f3 --- M Repository.mk M scp2/source/base/postgresqlsdbc.scp M scp2/source/canvas/canvascommons.scp M scp2/source/canvas/directxcanvas.scp M scp2/source/canvas/vclcanvas.scp M scp2/source/gnome/file_gnome.scp M scp2/source/ooo/file_library_ooo.scp M scp2/source/ooo/module_pdfimport.scp 8 files changed, 52 insertions(+), 77 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/61/3561/2 -- To view, visit https://gerrit.libreoffice.org/3561 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ieec4edf41140f9c5af3dcc227c917b06157a26f3 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Björn Michaelsen bjoern.michael...@canonical.com Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Matúš Kukan matus.ku...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#60949: Move the last libs to OOOLIBS
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3561 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/61/3561/1 fdo#60949: Move the last libs to OOOLIBS Change-Id: Ieec4edf41140f9c5af3dcc227c917b06157a26f3 --- M Repository.mk M scp2/source/base/postgresqlsdbc.scp M scp2/source/canvas/canvascommons.scp M scp2/source/canvas/directxcanvas.scp M scp2/source/canvas/vclcanvas.scp M scp2/source/gnome/file_gnome.scp M scp2/source/ooo/file_library_ooo.scp M scp2/source/ooo/module_pdfimport.scp 8 files changed, 52 insertions(+), 76 deletions(-) diff --git a/Repository.mk b/Repository.mk index 0afc24b..4bc6702 100644 --- a/Repository.mk +++ b/Repository.mk @@ -562,28 +562,56 @@ PresenterScreen \ basprov \ cairocanvas \ +canvasfactory \ +cmdmail \ +directx9canvas \ dlgprov \ expwrap \ fastsax \ +fpicker \ +fps_office \ gconfbe1 \ +gdipluscanvas \ +hatchwindowfactory \ i18nsearch \ kdebe1 \ kde4be1 \ ldapbe2 \ +losessioninstall \ +macbe1 \ migrationoo2 \ migrationoo3 \ msforms \ mtfrenderer \ OGLTrans \ +passwordcontainer \ +pdfimport \ +postgresql-sdbc \ +postgresql-sdbc-impl \ pythonloader \ +simplecanvas \ slideshow \ stringresource \ +syssh \ tdebe1 \ +ucpcmis1 \ +ucpext \ ucpgio1 \ ucpgvfs1 \ +ucptdoc1 \ +updatefeed \ vbaevents \ vbaobj \ vbaswobj \ +vclcanvas \ +$(if $(filter $(OS),MACOSX), \ +fps_aqua \ +) \ +$(if $(filter $(OS),WNT), \ +oleautobridge \ +smplmail \ +wininetbe1 \ +) \ )) $(eval $(call gb_Helper_register_libraries_for_install,UNOLIBS_OOO,OOO, \ @@ -595,36 +623,8 @@ ucpexpand1 \ )) $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ -canvasfactory \ -cmdmail \ directx5canvas \ -directx9canvas \ -fpicker \ -fps_office \ -gdipluscanvas \ -hatchwindowfactory \ -losessioninstall \ -macbe1 \ nullcanvas \ -passwordcontainer \ -pdfimport \ -postgresql-sdbc \ -postgresql-sdbc-impl \ -simplecanvas \ -syssh \ -ucpcmis1 \ -ucpext \ -ucptdoc1 \ -updatefeed \ -vclcanvas \ -$(if $(filter $(OS),MACOSX), \ -fps_aqua \ -) \ - $(if $(filter $(OS),WNT), \ - oleautobridge \ - smplmail \ - wininetbe1 \ - ) \ )) $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \ diff --git a/scp2/source/base/postgresqlsdbc.scp b/scp2/source/base/postgresqlsdbc.scp index 90e8631..e584d53 100644 --- a/scp2/source/base/postgresqlsdbc.scp +++ b/scp2/source/base/postgresqlsdbc.scp @@ -45,9 +45,9 @@ Styles = (); End -SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_PostgresqlSdbc, postgresql-sdbc.uno) +SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_PostgresqlSdbc, postgresql-sdbc) -SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_PostgresqlSdbcImpl, postgresql-sdbc-impl.uno) +SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_PostgresqlSdbcImpl, postgresql-sdbc-impl) File gid_File_PostgresqlSdbc_Ini TXT_FILE_BODY; diff --git a/scp2/source/canvas/canvascommons.scp b/scp2/source/canvas/canvascommons.scp index f390a9e..d91ba70 100644 --- a/scp2/source/canvas/canvascommons.scp +++ b/scp2/source/canvas/canvascommons.scp @@ -27,5 +27,5 @@ #include macros.inc -SPECIAL_COMPONENT_LIB_FILE(gid_File_CanvasFactory, canvasfactory.uno) -SPECIAL_COMPONENT_LIB_FILE(gid_File_SimpleCanvas, simplecanvas.uno) +SPECIAL_COMPONENT_LIB_FILE(gid_File_CanvasFactory, canvasfactory) +SPECIAL_COMPONENT_LIB_FILE(gid_File_SimpleCanvas, simplecanvas) diff --git a/scp2/source/canvas/directxcanvas.scp b/scp2/source/canvas/directxcanvas.scp index cfa762d..970770d 100644 --- a/scp2/source/canvas/directxcanvas.scp +++ b/scp2/source/canvas/directxcanvas.scp @@ -28,6 +28,6 @@ #include macros.inc #ifdef WNT -SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_DirectX9Canvas, directx9canvas.uno) -SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_GdiPlusCanvas, gdipluscanvas.uno) +SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_DirectX9Canvas, directx9canvas) +SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_GdiPlusCanvas, gdipluscanvas) #endif diff --git a/scp2/source/canvas/vclcanvas.scp b/scp2/source/canvas/vclcanvas.scp index c17301f..cb36501 100644 --- a/scp2/source/canvas/vclcanvas.scp +++ b/scp2/source/canvas/vclcanvas.scp @@ -27,4 +27,4 @@ #include macros.inc -SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_VCLCanvas, vclcanvas.uno) +SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_VCLCanvas, vclcanvas) diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp index cf9a498..875f174 100644 --- a/scp2/source/gnome/file_gnome.scp +++ b/scp2/source/gnome/file_gnome.scp @@ -29,7 +29,7 @@ #ifdef ENABLE_GIO STD_LIB_FILE( gid_File_Lib_GIO, ucpgio1 )
[PATCH] fdo#60949: Move more libs to OOOLIBS
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3511 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/11/3511/1 fdo#60949: Move more libs to OOOLIBS Change-Id: Ibd45f7004f8eaa151b9a60d7369d396411f60a2b --- M Repository.mk M scp2/source/gnome/file_gnome.scp M scp2/source/impress/file_impress.scp M scp2/source/kde/file_kde.scp M scp2/source/python/file_python.scp M scp2/source/tde/file_tde.scp 6 files changed, 16 insertions(+), 64 deletions(-) diff --git a/Repository.mk b/Repository.mk index 314ca61d..0afc24b 100644 --- a/Repository.mk +++ b/Repository.mk @@ -559,20 +559,28 @@ )) $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ +PresenterScreen \ basprov \ cairocanvas \ dlgprov \ expwrap \ fastsax \ +gconfbe1 \ i18nsearch \ +kdebe1 \ +kde4be1 \ ldapbe2 \ migrationoo2 \ migrationoo3 \ msforms \ mtfrenderer \ OGLTrans \ +pythonloader \ slideshow \ stringresource \ +tdebe1 \ +ucpgio1 \ +ucpgvfs1 \ vbaevents \ vbaobj \ vbaswobj \ @@ -587,33 +595,25 @@ ucpexpand1 \ )) $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ -PresenterScreen \ canvasfactory \ cmdmail \ directx5canvas \ directx9canvas \ fpicker \ fps_office \ -gconfbe1 \ gdipluscanvas \ hatchwindowfactory \ -kdebe1 \ -kde4be1 \ losessioninstall \ macbe1 \ nullcanvas \ passwordcontainer \ pdfimport \ -pythonloader \ postgresql-sdbc \ postgresql-sdbc-impl \ simplecanvas \ syssh \ -tdebe1 \ ucpcmis1 \ ucpext \ -ucpgio1 \ -ucpgvfs1 \ ucptdoc1 \ updatefeed \ vclcanvas \ diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp index 9672965..cf9a498 100644 --- a/scp2/source/gnome/file_gnome.scp +++ b/scp2/source/gnome/file_gnome.scp @@ -27,23 +27,13 @@ #include macros.inc #ifdef ENABLE_GIO -File gid_File_Lib_GIO -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; -Name = STRING(CONCAT2(ucpgio1.uno,UNXSUFFIX)); -End +STD_LIB_FILE( gid_File_Lib_GIO, ucpgio1 ) SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_Losessioninstall, losessioninstall.uno) #endif #ifdef ENABLE_GNOMEVFS -File gid_File_Lib_Gnomevfs -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; -Name = STRING(CONCAT2(ucpgvfs1.uno,UNXSUFFIX)); -End +STD_LIB_FILE( gid_File_Lib_Gnomevfs, ucpgvfs1 ) #endif #if (defined ENABLE_GCONF defined ENABLE_LOCKDOWN) || defined ENABLE_GIO @@ -56,12 +46,7 @@ #endif #ifdef ENABLE_GCONF -File gid_File_Lib_Gconfbe -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; -Name = STRING(CONCAT2(gconfbe1.uno,UNXSUFFIX)); -End +STD_LIB_FILE( gid_File_Lib_Gconfbe, gconfbe1 ) #endif #ifdef ENABLE_SYSTRAY_GTK diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp index f2eebf0..7753335 100644 --- a/scp2/source/impress/file_impress.scp +++ b/scp2/source/impress/file_impress.scp @@ -37,16 +37,7 @@ PACKED_LIB_FILE_BODY; End -File gid_File_Lib_PresenterScreen -LIB_FILE_BODY; -Dir = SCP2_OOO_BIN_DIR; -#if defined UNX -Name = STRING(CONCAT2(PresenterScreen.uno,UNXSUFFIX)); -#else -Name = PresenterScreen.uno.dll; -#endif -Styles = (PACKED); -End +STD_LIB_FILE( gid_File_Lib_PresenterScreen, PresenterScreen ) File gid_File_Share_Registry_Impress_Xcd TXT_FILE_BODY; diff --git a/scp2/source/kde/file_kde.scp b/scp2/source/kde/file_kde.scp index 1614f69..2f0320a 100644 --- a/scp2/source/kde/file_kde.scp +++ b/scp2/source/kde/file_kde.scp @@ -27,19 +27,9 @@ #include macros.inc #ifdef ENABLE_KDE -File gid_File_Lib_Kdebe -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; -Name = STRING(CONCAT2(kdebe1.uno,UNXSUFFIX)); -End +STD_LIB_FILE( gid_File_Lib_Kdebe, kdebe1 ) #endif #ifdef ENABLE_KDE4 -File gid_File_Lib_Kde4be -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; -Name = STRING(CONCAT2(kde4be1.uno,UNXSUFFIX)); -End +STD_LIB_FILE( gid_File_Lib_Kde4be, kde4be1 ) #endif diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index 614c732..c502986 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -54,16 +54,7 @@ Styles = (PACKED); End -File gid_File_Lib_Pythonloader -LIB_FILE_BODY; -Dir = gid_Brand_Dir_Program; - #ifdef UNX -Name = STRING(CONCAT2(pythonloader.uno,UNXSUFFIX)); - #else -Name = pythonloader.uno.dll; - #endif -Styles = (PACKED); -End +STD_LIB_FILE( gid_File_Lib_Pythonloader, pythonloader ) File gid_File_Py_Unohelper TXT_FILE_BODY; diff --git a/scp2/source/tde/file_tde.scp b/scp2/source/tde/file_tde.scp index 0a767d7..945b0de 100644 --- a/scp2/source/tde/file_tde.scp +++
[ABANDONED] fdo#57950: Chained appends in postgresql driver
Marcos Souza has abandoned this change. Change subject: fdo#57950: Chained appends in postgresql driver .. Patch Set 1: Abandoned Needs a rework. -- To view, visit https://gerrit.libreoffice.org/3170 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ic7bc35f5e65292d2d8a9d51418760c702676e478 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#60949: Move more libs to OOOLIBS
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3484 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/84/3484/1 fdo#60949: Move more libs to OOOLIBS Change-Id: I566602028556aa954bcbd116c375b9b61cc3df6f --- M Repository.mk M scp2/source/ooo/file_library_ooo.scp 2 files changed, 20 insertions(+), 110 deletions(-) diff --git a/Repository.mk b/Repository.mk index 22e03be..314ca61d 100644 --- a/Repository.mk +++ b/Repository.mk @@ -559,10 +559,20 @@ )) $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ +basprov \ cairocanvas \ +dlgprov \ +expwrap \ +fastsax \ +i18nsearch \ +ldapbe2 \ +migrationoo2 \ +migrationoo3 \ msforms \ mtfrenderer \ OGLTrans \ +slideshow \ +stringresource \ vbaevents \ vbaobj \ vbaswobj \ @@ -578,27 +588,19 @@ )) $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ PresenterScreen \ -basprov \ canvasfactory \ cmdmail \ directx5canvas \ directx9canvas \ -dlgprov \ -expwrap \ -fastsax \ fpicker \ fps_office \ gconfbe1 \ gdipluscanvas \ hatchwindowfactory \ -i18nsearch \ kdebe1 \ kde4be1 \ -ldapbe2 \ losessioninstall \ macbe1 \ -migrationoo2 \ -migrationoo3 \ nullcanvas \ passwordcontainer \ pdfimport \ @@ -606,8 +608,6 @@ postgresql-sdbc \ postgresql-sdbc-impl \ simplecanvas \ -slideshow \ -stringresource \ syssh \ tdebe1 \ ucpcmis1 \ diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index a993630..17f4668 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -44,16 +44,7 @@ STD_LIB_FILE( gid_File_Lib_Sf_Prothdlr, protocolhandler ) -File gid_File_Lib_Basprov -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX -Name = STRING(CONCAT3(basprov,.uno,UNXSUFFIX)); - #else -Name = STRING(CONCAT3(basprov,.uno,.dll)); - #endif -End +STD_LIB_FILE( gid_File_Lib_Basprov, basprov ) STD_LIB_FILE(gid_File_Lib_Vbaevent, vbaevents) @@ -98,16 +89,7 @@ End #endif -File gid_File_Lib_Ldapbe2 -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX -Name = STRING(CONCAT2(ldapbe2.uno,UNXSUFFIX)); - #else -Name = ldapbe2.uno.dll; - #endif -End +STD_LIB_FILE( gid_File_Lib_Ldapbe2, ldapbe2 ) #if defined _MSC_VER @@ -275,27 +257,9 @@ #ifndef DISABLE_SCRIPTING -File gid_File_Lib_Dlgprov -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX -Name = STRING(CONCAT3(dlgprov,.uno,UNXSUFFIX)); - #else -Name = STRING(CONCAT3(dlgprov,.uno,.dll)); - #endif -End +STD_LIB_FILE( gid_File_Lib_Dlgprov, dlgprov ) -File gid_File_Lib_Stringresource -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX -Name = STRING(CONCAT3(stringresource,.uno,UNXSUFFIX)); - #else -Name = STRING(CONCAT3(stringresource,.uno,.dll)); - #endif -End +STD_LIB_FILE( gid_File_Lib_Stringresource, stringresource ) STD_LIB_FILE(gid_File_Lib_Vbaobj, vbaobj) @@ -532,16 +496,7 @@ SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Hatchwindowfactory, hatchwindowfactory.uno ) -File gid_File_Lib_I18nsearch -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX -Name = STRING(CONCAT2(i18nsearch.uno,UNXSUFFIX)); - #else -Name = i18nsearch.uno.dll; - #endif -End +STD_LIB_FILE( gid_File_Lib_I18nsearch, i18nsearch ) File gid_File_Lib_I18nisolang #ifdef UNX @@ -893,27 +848,9 @@ Dir = SCP2_OOO_BIN_DIR; End -File gid_File_Lib_Expwrap_Uno -LIB_FILE_BODY; -Styles = (PACKED,DONT_OVERWRITE); -Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX -Name = STRING(CONCAT2(expwrap.uno,UNXSUFFIX)); - #else -Name = expwrap.uno.dll; - #endif -End +STD_LIB_FILE( gid_File_Lib_Expwrap_Uno, expwrap ) -File gid_File_Lib_Fastsax_Uno -LIB_FILE_BODY; -Styles = (PACKED,DONT_OVERWRITE); -Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX -Name = STRING(CONCAT2(fastsax.uno,UNXSUFFIX)); - #else -Name = fastsax.uno.dll; - #endif -End +STD_LIB_FILE( gid_File_Lib_Fastsax_Uno, fastsax ) STD_LIB_FILE( gid_File_Lib_Oox , oox) @@ -922,16 +859,7 @@ STD_LIB_FILE( gid_File_Lib_Sd , sd) STD_LIB_FILE( gid_File_Lib_Sdui, sdui) -File gid_File_Lib_Slideshow -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX -Name = STRING(CONCAT2(slideshow.uno,UNXSUFFIX)); - #else -Name = slideshow.uno.dll; - #endif -End +STD_LIB_FILE( gid_File_Lib_Slideshow, slideshow ) File gid_File_Lib_Sdbc_2 LIB_FILE_BODY; @@ -1234,27 +1162,9 @@ #endif #endif -File gid_File_Lib_Migrationoo2 -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX -Name =
[PATCH] fdo#63154: Change macros Min/Max for std::min/max
Hello LibreOffice gerrit bot, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/3326 to look at the new patch set (#3). Change subject: fdo#63154: Change macros Min/Max for std::min/max .. fdo#63154: Change macros Min/Max for std::min/max Now all these usages were removed from LO. Change-Id: I8a7233db20abdcdbb18428ad4004c78cc516a0e6 --- M UnoControls/source/controls/progressmonitor.cxx M accessibility/source/standard/vclxaccessiblelist.cxx M basctl/source/basicide/baside2.cxx M basic/source/runtime/methods.cxx M chart2/source/tools/CommonConverters.cxx M connectivity/source/drivers/dbase/DTable.cxx M connectivity/source/drivers/file/FNoException.cxx M connectivity/source/drivers/file/FResultSet.cxx M cui/source/customize/cfg.cxx M cui/source/dialogs/cuigrfflt.cxx M cui/source/options/fontsubs.cxx M cui/source/options/optinet2.cxx M cui/source/tabpages/page.cxx M cui/source/tabpages/swpossizetabpage.cxx M cui/source/tabpages/tpcolor.cxx M dbaccess/source/ui/querydesign/ConnectionLine.cxx M editeng/source/editeng/editdoc.cxx M editeng/source/editeng/impedit.cxx M editeng/source/editeng/impedit2.cxx M editeng/source/editeng/impedit3.cxx M editeng/source/editeng/impedit4.cxx M editeng/source/items/svxfont.cxx M editeng/source/items/textitem.cxx M editeng/source/outliner/outliner.cxx M filter/source/flash/swfwriter1.cxx M filter/source/graphicfilter/itiff/itiff.cxx M filter/source/svg/svgwriter.cxx M forms/source/component/GroupManager.cxx M fpicker/source/office/iodlg.cxx M linguistic/source/dicimp.cxx M linguistic/source/spelldta.cxx M reportdesign/source/ui/report/dlgedfunc.cxx M sc/inc/attarray.hxx M sc/inc/bigrange.hxx M sc/source/core/data/attarray.cxx M sc/source/core/data/column.cxx M sc/source/core/data/column3.cxx M sc/source/core/data/dociter.cxx M sc/source/core/data/documen2.cxx M sc/source/core/data/documen4.cxx M sc/source/core/data/document.cxx M sc/source/core/data/dptabsrc.cxx M sc/source/core/data/drwlayer.cxx M sc/source/core/data/funcdesc.cxx M sc/source/core/data/olinetab.cxx M sc/source/core/data/table1.cxx M sc/source/core/data/table2.cxx M sc/source/core/data/table3.cxx M sc/source/core/data/table4.cxx M sc/source/core/data/table6.cxx M sc/source/core/tool/address.cxx M sc/source/core/tool/compiler.cxx M sc/source/core/tool/consoli.cxx M sc/source/core/tool/interpr1.cxx M sc/source/core/tool/interpr2.cxx M sc/source/filter/excel/excdoc.cxx M sc/source/filter/excel/excform8.cxx M sc/source/filter/excel/excrecds.cxx M sc/source/filter/excel/xetable.cxx M sc/source/filter/excel/xlpage.cxx M sc/source/filter/html/htmlexp.cxx M sc/source/filter/html/htmlpars.cxx M sc/source/filter/starcalc/scflt.cxx M sc/source/filter/xml/XMLCellRangeSourceContext.cxx M sc/source/filter/xml/XMLConsolidationContext.cxx M sc/source/filter/xml/XMLTableSourceContext.cxx M sc/source/filter/xml/xmldrani.cxx M sc/source/ui/app/inputwin.cxx M sc/source/ui/app/scmod.cxx M sc/source/ui/cctrl/tbzoomsliderctrl.cxx M sc/source/ui/dbgui/csvcontrol.cxx M sc/source/ui/dbgui/csvgrid.cxx M sc/source/ui/dbgui/csvruler.cxx M sc/source/ui/dbgui/csvtablebox.cxx M sc/source/ui/docshell/arealink.cxx M sc/source/ui/docshell/dbdocimp.cxx M sc/source/ui/docshell/docsh4.cxx M sc/source/ui/docshell/docsh5.cxx M sc/source/ui/docshell/docsh6.cxx M sc/source/ui/drawfunc/fuconstr.cxx M sc/source/ui/drawfunc/fusel.cxx M sc/source/ui/drawfunc/futext.cxx M sc/source/ui/inc/csvtablebox.hxx M sc/source/ui/miscdlgs/crnrdlg.cxx M sc/source/ui/navipi/navipi.cxx M sc/source/ui/undo/undoblk.cxx M sc/source/ui/undo/undoblk3.cxx M sc/source/ui/unoobj/appluno.cxx M sc/source/ui/unoobj/cellsuno.cxx M sc/source/ui/vba/vbaapplication.cxx M sc/source/ui/view/cellsh3.cxx M sc/source/ui/view/gridwin4.cxx M sc/source/ui/view/hdrcont.cxx M sc/source/ui/view/hintwin.cxx M sc/source/ui/view/olinewin.cxx M sc/source/ui/view/output.cxx M sc/source/ui/view/output2.cxx M sc/source/ui/view/prevwsh.cxx M sc/source/ui/view/printfun.cxx M sc/source/ui/view/tabcont.cxx M sc/source/ui/view/tabview.cxx M sc/source/ui/view/tabview4.cxx M sc/source/ui/view/viewdata.cxx M sc/source/ui/view/viewfunc.cxx M sc/source/ui/view/viewutil.cxx M scaddins/source/analysis/analysishelper.cxx M sd/source/core/drawdoc2.cxx M sd/source/filter/ppt/pptin.cxx M sd/source/ui/dlg/animobjs.cxx M sd/source/ui/docshell/docshel2.cxx M sd/source/ui/docshell/sdclient.cxx M sd/source/ui/func/fuconstr.cxx M sd/source/ui/func/fucopy.cxx M sd/source/ui/func/fuediglu.cxx M sd/source/ui/func/fuinsfil.cxx M sd/source/ui/func/fusel.cxx M sd/source/ui/func/futext.cxx M sd/source/ui/slideshow/showwin.cxx M sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx M sd/source/ui/unoidl/unomodel.cxx M sd/source/ui/view/drtxtob.cxx M sd/source/ui/view/drtxtob1.cxx M sd/source/ui/view/drviews1.cxx M sd/source/ui/view/drviews3.cxx M sd/source/ui/view/drviewsb.cxx M sd/source/ui/view/drviewse.cxx M
[PATCH] fdo#60949: Move some libs to OOOLIBS
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3467 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/67/3467/1 fdo#60949: Move some libs to OOOLIBS Compile test only :) Change-Id: I14a64ba0b61933372c2e3c99666d74f3d115d134 --- M Repository.mk M scp2/source/canvas/cairocanvas.scp M scp2/source/ooo/file_library_ooo.scp 3 files changed, 10 insertions(+), 56 deletions(-) diff --git a/Repository.mk b/Repository.mk index 15c3481..22e03be 100644 --- a/Repository.mk +++ b/Repository.mk @@ -559,8 +559,13 @@ )) $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ +cairocanvas \ +msforms \ mtfrenderer \ OGLTrans \ +vbaevents \ +vbaobj \ +vbaswobj \ )) $(eval $(call gb_Helper_register_libraries_for_install,UNOLIBS_OOO,OOO, \ @@ -574,7 +579,6 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ PresenterScreen \ basprov \ -cairocanvas \ canvasfactory \ cmdmail \ directx5canvas \ @@ -595,7 +599,6 @@ macbe1 \ migrationoo2 \ migrationoo3 \ -msforms \ nullcanvas \ passwordcontainer \ pdfimport \ @@ -613,9 +616,6 @@ ucpgvfs1 \ ucptdoc1 \ updatefeed \ -vbaevents \ -vbaobj \ -vbaswobj \ vclcanvas \ $(if $(filter $(OS),MACOSX), \ fps_aqua \ diff --git a/scp2/source/canvas/cairocanvas.scp b/scp2/source/canvas/cairocanvas.scp index 4b313bc..de5742a 100644 --- a/scp2/source/canvas/cairocanvas.scp +++ b/scp2/source/canvas/cairocanvas.scp @@ -27,14 +27,4 @@ #include macros.inc -File gid_File_Lib_CairoCanvas -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX -Name = STRING(CONCAT2(cairocanvas.uno,UNXSUFFIX)); - #else -Name = cairocanvas.uno.dll; - #endif -End - +STD_LIB_FILE(gid_File_Lib_CairoCanvas, cairocanvas) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 5aafd04..9846d56 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -55,16 +55,7 @@ #endif End -File gid_File_Lib_Vbaevent -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX -Name = STRING(CONCAT3(vbaevents,.uno,UNXSUFFIX)); - #else -Name = STRING(CONCAT3(vbaevents,.uno,.dll)); - #endif -End +STD_LIB_FILE(gid_File_Lib_Vbaevent, vbaevent) File gid_File_Lib_Scriptframe LIB_FILE_BODY; @@ -306,38 +297,11 @@ #endif End -File gid_File_Lib_Vbaobj -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX -Name = STRING(CONCAT3(vbaobj,.uno,UNXSUFFIX)); - #else -Name = STRING(CONCAT3(vbaobj,.uno,.dll)); - #endif -End +STD_LIB_FILE(gid_File_Lib_Vbaobj, vbaobj) -File gid_File_Lib_Vbaswobj -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX -Name = STRING(CONCAT3(vbaswobj,.uno,UNXSUFFIX)); - #else -Name = STRING(CONCAT3(vbaswobj,.uno,.dll)); - #endif -End +STD_LIB_FILE(gid_File_Lib_Vbaswobj, vbaswobj) -File gid_File_Lib_Vbamsforms -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX -Name = STRING(CONCAT3(msforms,.uno,UNXSUFFIX)); - #else -Name = STRING(CONCAT3(msforms,.uno,.dll)); - #endif -End +STD_LIB_FILE(gid_File_Lib_Vbamsforms, msforms) File gid_File_Lib_Vbahelper LIB_FILE_BODY; -- To view, visit https://gerrit.libreoffice.org/3467 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I14a64ba0b61933372c2e3c99666d74f3d115d134 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#62699: Drop wrapper header
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3473 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/73/3473/1 fdo#62699: Drop wrapper header Change-Id: I21e91ab136c944c6dc77a90500b1bcebbf7cf851 --- M filter/source/msfilter/svdfppt.cxx M svx/Package_inc.mk D svx/inc/svx/svditext.hxx M svx/source/svdraw/svdattr.cxx M svx/source/svdraw/svdedtv1.cxx M svx/source/svdraw/svdedxv.cxx M svx/source/svdraw/svdetc.cxx M svx/source/svdraw/svdfmtf.cxx M svx/source/svdraw/svdibrow.cxx M svx/source/svdraw/svdmodel.cxx M svx/source/svdraw/svdmrkv.cxx M svx/source/svdraw/svdoattr.cxx M svx/source/svdraw/svdomeas.cxx M svx/source/svdraw/svdotext.cxx M svx/source/svdraw/svdotxat.cxx M svx/source/svdraw/svdotxed.cxx M svx/source/svdraw/svdotxln.cxx M svx/source/svdraw/svdotxtr.cxx M svx/source/svdraw/svdundo.cxx M svx/source/svdraw/svdxcgv.cxx 20 files changed, 17 insertions(+), 50 deletions(-) diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 104db58..a39dfe1 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -22,6 +22,7 @@ #include unotools/tempfile.hxx #include math.h #include editeng/eeitem.hxx +#include editeng/editdata.hxx #include sot/storage.hxx #include sot/storinfo.hxx #include sot/stg.hxx @@ -51,7 +52,6 @@ #include editeng/numdef.hxx #include svx/svdattr.hxx #include svx/xattr.hxx -#include svx/svditext.hxx #include svx/svdetc.hxx #include editeng/bulletitem.hxx #include svx/polysc3d.hxx diff --git a/svx/Package_inc.mk b/svx/Package_inc.mk index cb54894..5b25ac3 100644 --- a/svx/Package_inc.mk +++ b/svx/Package_inc.mk @@ -388,7 +388,6 @@ $(eval $(call gb_Package_add_file,svx_inc,inc/svx/fontworkgallery.hxx,svx/fontworkgallery.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/ShapeTypeHandler.hxx,svx/ShapeTypeHandler.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdstr.hrc,svx/svdstr.hrc)) -$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svditext.hxx,svx/svditext.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxekitm.hxx,svx/sxekitm.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxgrahicitem.hxx,svx/svxgrahicitem.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbstit.hxx,svx/xflbstit.hxx)) diff --git a/svx/inc/svx/svditext.hxx b/svx/inc/svx/svditext.hxx deleted file mode 100644 index 586d51d..000 --- a/svx/inc/svx/svditext.hxx +++ /dev/null @@ -1,30 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the License); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef _SVDITEXT_HXX -#define _SVDITEXT_HXX - -// SvxItem-Mapping. Wird benoetigt um die SvxItem-Header erfolgreich zu includen - -#include editeng/editdata.hxx - - -#endif // _SVDITEXT_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index d160b73..25e0710 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -39,10 +39,10 @@ #include svl/solar.hrc #include editeng/xmlcnitm.hxx +#include editeng/editdata.hxx #include svx/svxids.hrc #include svx/xtable.hxx// for RGB_Color() -#include svx/svditext.hxx #include svx/svdmodel.hxx // for DEGREE_CHAR #include svx/svdtrans.hxx #include svx/svdglob.hxx // string cache diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index 50397b4..9a0528c 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -27,7 +27,6 @@ #include svx/rectenum.hxx #include svx/svxids.hrc // for SID_ATTR_TRANSFORM_... #include svx/svdattr.hxx // for Get/SetGeoAttr -#include svx/svditext.hxx #include svx/svditer.hxx #include svx/svdtrans.hxx #include svx/svdundo.hxx @@ -39,6 +38,7 @@ #include svx/svdopath.hxx // for Crook #include svx/svdstr.hrc // names taken from the resource #include svx/svdglob.hxx // StringCache +#include editeng/editdata.hxx #include editeng/eeitem.hxx #include svl/aeitem.hxx #include svl/whiter.hxx diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 18e1250..0465319
[PATCH] fdo#60949: Move some libs to OOOLIBS
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3476 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/76/3476/1 fdo#60949: Move some libs to OOOLIBS Compile test only :) Change-Id: I1e546b824ec027bb1321e36fb060af5b4cfd1bf1 --- M Repository.mk M scp2/source/canvas/cairocanvas.scp M scp2/source/ooo/file_library_ooo.scp 3 files changed, 10 insertions(+), 56 deletions(-) diff --git a/Repository.mk b/Repository.mk index 15c3481..22e03be 100644 --- a/Repository.mk +++ b/Repository.mk @@ -559,8 +559,13 @@ )) $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ +cairocanvas \ +msforms \ mtfrenderer \ OGLTrans \ +vbaevents \ +vbaobj \ +vbaswobj \ )) $(eval $(call gb_Helper_register_libraries_for_install,UNOLIBS_OOO,OOO, \ @@ -574,7 +579,6 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ PresenterScreen \ basprov \ -cairocanvas \ canvasfactory \ cmdmail \ directx5canvas \ @@ -595,7 +599,6 @@ macbe1 \ migrationoo2 \ migrationoo3 \ -msforms \ nullcanvas \ passwordcontainer \ pdfimport \ @@ -613,9 +616,6 @@ ucpgvfs1 \ ucptdoc1 \ updatefeed \ -vbaevents \ -vbaobj \ -vbaswobj \ vclcanvas \ $(if $(filter $(OS),MACOSX), \ fps_aqua \ diff --git a/scp2/source/canvas/cairocanvas.scp b/scp2/source/canvas/cairocanvas.scp index 4b313bc..de5742a 100644 --- a/scp2/source/canvas/cairocanvas.scp +++ b/scp2/source/canvas/cairocanvas.scp @@ -27,14 +27,4 @@ #include macros.inc -File gid_File_Lib_CairoCanvas -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX -Name = STRING(CONCAT2(cairocanvas.uno,UNXSUFFIX)); - #else -Name = cairocanvas.uno.dll; - #endif -End - +STD_LIB_FILE(gid_File_Lib_CairoCanvas, cairocanvas) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 5aafd04..a993630 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -55,16 +55,7 @@ #endif End -File gid_File_Lib_Vbaevent -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX -Name = STRING(CONCAT3(vbaevents,.uno,UNXSUFFIX)); - #else -Name = STRING(CONCAT3(vbaevents,.uno,.dll)); - #endif -End +STD_LIB_FILE(gid_File_Lib_Vbaevent, vbaevents) File gid_File_Lib_Scriptframe LIB_FILE_BODY; @@ -306,38 +297,11 @@ #endif End -File gid_File_Lib_Vbaobj -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX -Name = STRING(CONCAT3(vbaobj,.uno,UNXSUFFIX)); - #else -Name = STRING(CONCAT3(vbaobj,.uno,.dll)); - #endif -End +STD_LIB_FILE(gid_File_Lib_Vbaobj, vbaobj) -File gid_File_Lib_Vbaswobj -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX -Name = STRING(CONCAT3(vbaswobj,.uno,UNXSUFFIX)); - #else -Name = STRING(CONCAT3(vbaswobj,.uno,.dll)); - #endif -End +STD_LIB_FILE(gid_File_Lib_Vbaswobj, vbaswobj) -File gid_File_Lib_Vbamsforms -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX -Name = STRING(CONCAT3(msforms,.uno,UNXSUFFIX)); - #else -Name = STRING(CONCAT3(msforms,.uno,.dll)); - #endif -End +STD_LIB_FILE(gid_File_Lib_Vbamsforms, msforms) File gid_File_Lib_Vbahelper LIB_FILE_BODY; -- To view, visit https://gerrit.libreoffice.org/3476 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1e546b824ec027bb1321e36fb060af5b4cfd1bf1 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] fdo#60949: Move some libs to OOOLIBS
Marcos Souza has abandoned this change. Change subject: fdo#60949: Move some libs to OOOLIBS .. Patch Set 1: Abandoned A new change-id was generated(my bad) so abandoning this -- To view, visit https://gerrit.libreoffice.org/3467 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I14a64ba0b61933372c2e3c99666d74f3d115d134 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Björn Michaelsen bjoern.michael...@canonical.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#63154: Change macros Min/Max for std::min/max
Hello LibreOffice gerrit bot, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/3326 to look at the new patch set (#2). Change subject: fdo#63154: Change macros Min/Max for std::min/max .. fdo#63154: Change macros Min/Max for std::min/max Now all these usages were removed from LO. Change-Id: I8a7233db20abdcdbb18428ad4004c78cc516a0e6 --- M UnoControls/source/controls/progressmonitor.cxx M accessibility/source/standard/vclxaccessiblelist.cxx M basctl/source/basicide/baside2.cxx M basic/source/runtime/methods.cxx M chart2/source/tools/CommonConverters.cxx M connectivity/source/drivers/dbase/DTable.cxx M connectivity/source/drivers/file/FNoException.cxx M connectivity/source/drivers/file/FResultSet.cxx M cui/source/customize/cfg.cxx M cui/source/dialogs/cuigrfflt.cxx M cui/source/options/fontsubs.cxx M cui/source/options/optinet2.cxx M cui/source/tabpages/page.cxx M cui/source/tabpages/swpossizetabpage.cxx M cui/source/tabpages/tpcolor.cxx M dbaccess/source/ui/querydesign/ConnectionLine.cxx M editeng/source/editeng/editdoc.cxx M editeng/source/editeng/impedit.cxx M editeng/source/editeng/impedit2.cxx M editeng/source/editeng/impedit3.cxx M editeng/source/editeng/impedit4.cxx M editeng/source/items/svxfont.cxx M editeng/source/items/textitem.cxx M editeng/source/outliner/outliner.cxx M filter/source/flash/swfwriter1.cxx M filter/source/graphicfilter/itiff/itiff.cxx M filter/source/svg/svgwriter.cxx M forms/source/component/GroupManager.cxx M fpicker/source/office/iodlg.cxx M linguistic/source/dicimp.cxx M linguistic/source/spelldta.cxx M reportdesign/source/ui/report/dlgedfunc.cxx M sc/inc/attarray.hxx M sc/inc/bigrange.hxx M sc/source/core/data/attarray.cxx M sc/source/core/data/column.cxx M sc/source/core/data/column3.cxx M sc/source/core/data/dociter.cxx M sc/source/core/data/documen2.cxx M sc/source/core/data/documen4.cxx M sc/source/core/data/document.cxx M sc/source/core/data/dptabsrc.cxx M sc/source/core/data/drwlayer.cxx M sc/source/core/data/funcdesc.cxx M sc/source/core/data/olinetab.cxx M sc/source/core/data/table1.cxx M sc/source/core/data/table2.cxx M sc/source/core/data/table3.cxx M sc/source/core/data/table4.cxx M sc/source/core/data/table6.cxx M sc/source/core/tool/address.cxx M sc/source/core/tool/compiler.cxx M sc/source/core/tool/consoli.cxx M sc/source/core/tool/interpr1.cxx M sc/source/core/tool/interpr2.cxx M sc/source/filter/excel/excdoc.cxx M sc/source/filter/excel/excform8.cxx M sc/source/filter/excel/excrecds.cxx M sc/source/filter/excel/xetable.cxx M sc/source/filter/excel/xlpage.cxx M sc/source/filter/html/htmlexp.cxx M sc/source/filter/html/htmlpars.cxx M sc/source/filter/starcalc/scflt.cxx M sc/source/filter/xml/XMLCellRangeSourceContext.cxx M sc/source/filter/xml/XMLConsolidationContext.cxx M sc/source/filter/xml/XMLTableSourceContext.cxx M sc/source/filter/xml/xmldrani.cxx M sc/source/ui/app/inputwin.cxx M sc/source/ui/app/scmod.cxx M sc/source/ui/cctrl/tbzoomsliderctrl.cxx M sc/source/ui/dbgui/csvcontrol.cxx M sc/source/ui/dbgui/csvgrid.cxx M sc/source/ui/dbgui/csvruler.cxx M sc/source/ui/dbgui/csvtablebox.cxx M sc/source/ui/docshell/arealink.cxx M sc/source/ui/docshell/dbdocimp.cxx M sc/source/ui/docshell/docsh4.cxx M sc/source/ui/docshell/docsh5.cxx M sc/source/ui/docshell/docsh6.cxx M sc/source/ui/drawfunc/fuconstr.cxx M sc/source/ui/drawfunc/fusel.cxx M sc/source/ui/drawfunc/futext.cxx M sc/source/ui/inc/csvtablebox.hxx M sc/source/ui/miscdlgs/crnrdlg.cxx M sc/source/ui/navipi/navipi.cxx M sc/source/ui/undo/undoblk.cxx M sc/source/ui/undo/undoblk3.cxx M sc/source/ui/unoobj/appluno.cxx M sc/source/ui/unoobj/cellsuno.cxx M sc/source/ui/vba/vbaapplication.cxx M sc/source/ui/view/cellsh3.cxx M sc/source/ui/view/gridwin4.cxx M sc/source/ui/view/hdrcont.cxx M sc/source/ui/view/hintwin.cxx M sc/source/ui/view/olinewin.cxx M sc/source/ui/view/output.cxx M sc/source/ui/view/output2.cxx M sc/source/ui/view/prevwsh.cxx M sc/source/ui/view/printfun.cxx M sc/source/ui/view/tabcont.cxx M sc/source/ui/view/tabview.cxx M sc/source/ui/view/tabview4.cxx M sc/source/ui/view/viewdata.cxx M sc/source/ui/view/viewfunc.cxx M sc/source/ui/view/viewutil.cxx M scaddins/source/analysis/analysishelper.cxx M sd/source/core/drawdoc2.cxx M sd/source/filter/ppt/pptin.cxx M sd/source/ui/dlg/animobjs.cxx M sd/source/ui/docshell/docshel2.cxx M sd/source/ui/docshell/sdclient.cxx M sd/source/ui/func/fuconstr.cxx M sd/source/ui/func/fucopy.cxx M sd/source/ui/func/fuediglu.cxx M sd/source/ui/func/fuinsfil.cxx M sd/source/ui/func/fusel.cxx M sd/source/ui/func/futext.cxx M sd/source/ui/slideshow/showwin.cxx M sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx M sd/source/ui/unoidl/unomodel.cxx M sd/source/ui/view/drtxtob.cxx M sd/source/ui/view/drtxtob1.cxx M sd/source/ui/view/drviews1.cxx M sd/source/ui/view/drviews3.cxx M sd/source/ui/view/drviewsb.cxx M sd/source/ui/view/drviewse.cxx M
[PATCH] fdo#63154: Change macros Min/Max for std::min/max
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3326 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/26/3326/1 fdo#63154: Change macros Min/Max for std::min/max Now all these usages were removed from LO. Change-Id: I8a7233db20abdcdbb18428ad4004c78cc516a0e6 --- M UnoControls/source/controls/progressmonitor.cxx M accessibility/source/standard/vclxaccessiblelist.cxx M basctl/source/basicide/baside2.cxx M basic/source/runtime/methods.cxx M chart2/source/tools/CommonConverters.cxx M connectivity/source/drivers/dbase/DTable.cxx M connectivity/source/drivers/file/FNoException.cxx M connectivity/source/drivers/file/FResultSet.cxx M cui/source/customize/cfg.cxx M cui/source/dialogs/cuigrfflt.cxx M cui/source/options/fontsubs.cxx M cui/source/options/optinet2.cxx M cui/source/tabpages/page.cxx M cui/source/tabpages/swpossizetabpage.cxx M cui/source/tabpages/tpcolor.cxx M dbaccess/source/ui/querydesign/ConnectionLine.cxx M editeng/source/editeng/editdoc.cxx M editeng/source/editeng/impedit.cxx M editeng/source/editeng/impedit2.cxx M editeng/source/editeng/impedit3.cxx M editeng/source/editeng/impedit4.cxx M editeng/source/items/svxfont.cxx M editeng/source/items/textitem.cxx M editeng/source/outliner/outliner.cxx M filter/source/flash/swfwriter1.cxx M filter/source/graphicfilter/itiff/itiff.cxx M filter/source/svg/svgwriter.cxx M forms/source/component/GroupManager.cxx M fpicker/source/office/iodlg.cxx M linguistic/source/dicimp.cxx M linguistic/source/spelldta.cxx M reportdesign/source/ui/report/dlgedfunc.cxx M sc/inc/attarray.hxx M sc/inc/bigrange.hxx M sc/source/core/data/attarray.cxx M sc/source/core/data/column.cxx M sc/source/core/data/column3.cxx M sc/source/core/data/dociter.cxx M sc/source/core/data/documen2.cxx M sc/source/core/data/documen4.cxx M sc/source/core/data/document.cxx M sc/source/core/data/dptabsrc.cxx M sc/source/core/data/drwlayer.cxx M sc/source/core/data/funcdesc.cxx M sc/source/core/data/olinetab.cxx M sc/source/core/data/table1.cxx M sc/source/core/data/table2.cxx M sc/source/core/data/table3.cxx M sc/source/core/data/table4.cxx M sc/source/core/data/table6.cxx M sc/source/core/tool/address.cxx M sc/source/core/tool/compiler.cxx M sc/source/core/tool/consoli.cxx M sc/source/core/tool/interpr1.cxx M sc/source/core/tool/interpr2.cxx M sc/source/filter/excel/excdoc.cxx M sc/source/filter/excel/excform8.cxx M sc/source/filter/excel/excrecds.cxx M sc/source/filter/excel/xetable.cxx M sc/source/filter/excel/xlpage.cxx M sc/source/filter/html/htmlexp.cxx M sc/source/filter/html/htmlpars.cxx M sc/source/filter/starcalc/scflt.cxx M sc/source/filter/xml/XMLCellRangeSourceContext.cxx M sc/source/filter/xml/XMLConsolidationContext.cxx M sc/source/filter/xml/XMLTableSourceContext.cxx M sc/source/filter/xml/xmldrani.cxx M sc/source/ui/app/inputwin.cxx M sc/source/ui/app/scmod.cxx M sc/source/ui/cctrl/tbzoomsliderctrl.cxx M sc/source/ui/dbgui/csvcontrol.cxx M sc/source/ui/dbgui/csvgrid.cxx M sc/source/ui/dbgui/csvruler.cxx M sc/source/ui/dbgui/csvtablebox.cxx M sc/source/ui/docshell/arealink.cxx M sc/source/ui/docshell/dbdocimp.cxx M sc/source/ui/docshell/docsh4.cxx M sc/source/ui/docshell/docsh5.cxx M sc/source/ui/docshell/docsh6.cxx M sc/source/ui/drawfunc/fuconstr.cxx M sc/source/ui/drawfunc/fusel.cxx M sc/source/ui/drawfunc/futext.cxx M sc/source/ui/inc/csvtablebox.hxx M sc/source/ui/miscdlgs/crnrdlg.cxx M sc/source/ui/navipi/navipi.cxx M sc/source/ui/undo/undoblk.cxx M sc/source/ui/undo/undoblk3.cxx M sc/source/ui/unoobj/appluno.cxx M sc/source/ui/unoobj/cellsuno.cxx M sc/source/ui/vba/vbaapplication.cxx M sc/source/ui/view/cellsh3.cxx M sc/source/ui/view/gridwin4.cxx M sc/source/ui/view/hdrcont.cxx M sc/source/ui/view/hintwin.cxx M sc/source/ui/view/olinewin.cxx M sc/source/ui/view/output.cxx M sc/source/ui/view/output2.cxx M sc/source/ui/view/prevwsh.cxx M sc/source/ui/view/printfun.cxx M sc/source/ui/view/tabcont.cxx M sc/source/ui/view/tabview.cxx M sc/source/ui/view/tabview4.cxx M sc/source/ui/view/viewdata.cxx M sc/source/ui/view/viewfunc.cxx M sc/source/ui/view/viewutil.cxx M scaddins/source/analysis/analysishelper.cxx M sd/source/core/drawdoc2.cxx M sd/source/filter/ppt/pptin.cxx M sd/source/ui/dlg/animobjs.cxx M sd/source/ui/docshell/docshel2.cxx M sd/source/ui/docshell/sdclient.cxx M sd/source/ui/func/fuconstr.cxx M sd/source/ui/func/fucopy.cxx M sd/source/ui/func/fuediglu.cxx M sd/source/ui/func/fuinsfil.cxx M sd/source/ui/func/fusel.cxx M sd/source/ui/func/futext.cxx M sd/source/ui/slideshow/showwin.cxx M sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx M sd/source/ui/unoidl/unomodel.cxx M sd/source/ui/view/drtxtob.cxx M sd/source/ui/view/drtxtob1.cxx M sd/source/ui/view/drviews1.cxx M sd/source/ui/view/drviews3.cxx M sd/source/ui/view/drviewsb.cxx M sd/source/ui/view/drviewse.cxx M sd/source/ui/view/grviewsh.cxx M sd/source/ui/view/outlnvs2.cxx M sd/source/ui/view/outlnvsh.cxx M
[PATCH] fdo#57950: Chained appends in postgresql driver
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3170
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/70/3170/1
fdo#57950: Chained appends in postgresql driver
While studing the postgresql driver I found these chained appends.
More will come :)
Change-Id: Ic7bc35f5e65292d2d8a9d51418760c702676e478
---
M connectivity/source/drivers/postgresql/pq_array.cxx
M connectivity/source/drivers/postgresql/pq_baseresultset.cxx
M connectivity/source/drivers/postgresql/pq_connection.cxx
M connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
M connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
M connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
M connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx
M connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
M connectivity/source/drivers/postgresql/pq_xbase.cxx
M connectivity/source/drivers/postgresql/pq_xcolumns.cxx
10 files changed, 93 insertions(+), 396 deletions(-)
diff --git a/connectivity/source/drivers/postgresql/pq_array.cxx
b/connectivity/source/drivers/postgresql/pq_array.cxx
index 9344bd2..73d7a05 100644
--- a/connectivity/source/drivers/postgresql/pq_array.cxx
+++ b/connectivity/source/drivers/postgresql/pq_array.cxx
@@ -137,16 +137,10 @@
{
if( index = 1 index -1 + count = m_data.getLength() )
return;
-rtl::OUStringBuffer buf;
-buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( Array::getArrayAtIndex():
allowed range for index + count ) );
-buf.append( m_data.getLength() );
-buf.appendAscii( , got );
-buf.append( index );
-buf.appendAscii( + );
-buf.append( count );
+OUString buf( Array::getArrayAtIndex(): allowed range for index + count
+ OUString::number( m_data.getLength() ) +
+ , got + OUString::number( index ) + + +
OUString::number( count ));
-throw SQLException( buf.makeStringAndClear() , *this, rtl::OUString(), 1,
Any());
-
+throw SQLException( buf, *this, , 1, Any());
}
}
diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
index 0f9e0ae..dc9b116 100644
--- a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
@@ -664,11 +664,8 @@
}
default:
{
-OUStringBuffer buf(128);
-buf.appendAscii( pq_resultset: Invalid property handle ( );
-buf.append( nHandle );
-buf.appendAscii( ) );
-throw IllegalArgumentException( buf.makeStringAndClear(), *this, 2 );
+throw IllegalArgumentException(pq_resultset: Invalid property handle
( + OUString::number( nHandle ) + )
+ , *this, 2 );
}
}
return bRet;
@@ -701,43 +698,27 @@
{
if( index 1 || index m_fieldCount )
{
-OUStringBuffer buf(128);
-buf.appendAscii( pq_resultset: index out of range ( );
-buf.append( index );
-buf.appendAscii( , allowed range is 1 to );
-buf.append( m_fieldCount );
-buf.appendAscii( ) );
-throw SQLException( buf.makeStringAndClear(), *this, OUString(), 1,
Any() );
+throw SQLException( pq_resultset: index out of range ( +
OUString::number( index ) +
+, allowed range is 1 to + OUString::number(
m_fieldCount ) + )
+, *this, , 1, Any() );
}
-
}
void BaseResultSet::checkRowIndex( sal_Bool mustBeOnValidRow )
{
-OUStringBuffer buf( 128 );
-buf.appendAscii( pq_baseresultset: row index out of range, allowed is );
+OUStringBuffer buf(pq_baseresultset: row index out of range, allowed is
);
if( mustBeOnValidRow )
{
if( m_row 0 || m_row = m_rowCount )
-{
-buf.appendAscii( 0 to );
-buf.append( ((sal_Int32)(m_rowCount -1)) );
-buf.appendAscii( , got );
-buf.append( m_row );
-throw SQLException( buf.makeStringAndClear(), *this, OUString(),1,
Any() );
-}
+buf.append( 0 to + OUString::number(m_rowCount -1) );
}
else
{
if( m_row -1 || m_row m_rowCount )
-{
-buf.appendAscii( -1 to );
-buf.append( m_rowCount );
-buf.appendAscii( , got );
-buf.append( m_row );
-throw SQLException( buf.makeStringAndClear(), *this, OUString(),1,
Any() );
-}
+buf.append( -1 to + OUString::number( m_rowCount ) );
}
+buf.append( , got + OUString::number( m_row ) );
+throw SQLException( buf.makeStringAndClear(), *this, OUString(),1, Any() );
}
}
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx
b/connectivity/source/drivers/postgresql/pq_connection.cxx
index e0060e9..bbe4af2 100644
---
[PATCH] fod#57950: Removed some chained appends from sw
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2643
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/43/2643/1
fod#57950: Removed some chained appends from sw
Change-Id: I5b78b4a8f2fc0fb0c4a67042ac4924e375c2d63a
---
M sw/source/core/attr/format.cxx
M sw/source/core/bastyp/swcache.cxx
M sw/source/core/frmedt/fetab.cxx
M sw/source/filter/html/css1atr.cxx
M sw/source/ui/envelp/envlop1.cxx
M sw/source/ui/envelp/label1.cxx
M sw/source/ui/fldui/changedb.cxx
M sw/source/ui/uiview/pview.cxx
M sw/source/ui/uiview/viewsrch.cxx
M sw/source/ui/utlui/content.cxx
M sw/source/ui/wrtsh/wrtundo.cxx
11 files changed, 81 insertions(+), 188 deletions(-)
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index 4524937..1530b5f 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -224,9 +224,8 @@
SwFmt* pParentFmt = DerivedFrom();
if( !pParentFmt )
{
-OSL_FAIL(rtl::OStringBuffer(
-RTL_CONSTASCII_STRINGPARAM(~SwFmt: parent format missing
from: )).
-append(rtl::OUStringToOString(GetName(),
osl_getThreadTextEncoding())).getStr());
+OSL_FAIL(~SwFmt: parent format missing from: +
+ OUStringToOString(GetName(),
osl_getThreadTextEncoding()));
}
else
{
diff --git a/sw/source/core/bastyp/swcache.cxx
b/sw/source/core/bastyp/swcache.cxx
index 588d2ce..7fc8909 100644
--- a/sw/source/core/bastyp/swcache.cxx
+++ b/sw/source/core/bastyp/swcache.cxx
@@ -100,61 +100,20 @@
{
#ifdef DBG_UTIL
{
-rtl::OStringBuffer sOut(m_aName);
-
-sOut.append('\n').
-append(RTL_CONSTASCII_STRINGPARAM(
-Number of new entries: )).
-append(static_castsal_Int32(m_nAppend)).
-append('\n').
-append(RTL_CONSTASCII_STRINGPARAM(
-Number of insert on free places: )).
-append(static_castsal_Int32(m_nInsertFree)).
-append('\n').
-append(RTL_CONSTASCII_STRINGPARAM(
-Number of replacements:)).
-append(static_castsal_Int32(m_nReplace)).
-append('\n').
-append(RTL_CONSTASCII_STRINGPARAM(
-Number of successful Get's:)).
-append(static_castsal_Int32(m_nGetSuccess)).
-append('\n').
-append(RTL_CONSTASCII_STRINGPARAM(
-Number of failed Get's:)).
-append(static_castsal_Int32(m_nGetFail)).
-append('\n').
-append(RTL_CONSTASCII_STRINGPARAM(
-Number or reordering (LRU):)).
-append(static_castsal_Int32(m_nToTop)).
-append('\n').
-append(RTL_CONSTASCII_STRINGPARAM(
-Number of suppressions:)).
-append(static_castsal_Int32(m_nDelete)).
-append('\n').
-append(RTL_CONSTASCII_STRINGPARAM(
-Number of Get's without Index: )).
-append(static_castsal_Int32(m_nGetSeek)).
-append('\n').
-append(RTL_CONSTASCII_STRINGPARAM(
-Number of Seek for Get without Index: )).
-append(static_castsal_Int32(m_nAverageSeekCnt)).
-append('\n').
-append(RTL_CONSTASCII_STRINGPARAM(
-Number of Flush calls: )).
-append(static_castsal_Int32(m_nFlushCnt)).
-append('\n').
-append(RTL_CONSTASCII_STRINGPARAM(
-Number of flushed objects: )).
-append(static_castsal_Int32(m_nFlushedObjects)).
-append('\n').
-append(RTL_CONSTASCII_STRINGPARAM(
-Number of Cache expansions:)).
-append(static_castsal_Int32(m_nIncreaseMax)).
-append('\n').
-append(RTL_CONSTASCII_STRINGPARAM(
-Number of Cache reductions:)).
-append(static_castsal_Int32(m_nDecreaseMax)).
-append('\n');
+OString sOut(m_aName + \n +
+Number of new entries: +
OString::number(m_nAppend) + \n +
+Number of insert on free places:+
OString::number(m_nInsertFree) + \n +
+Number of replacements: +
OString::number(m_nReplace) + \n +
+Number of successful Get's: +
OString::number(m_nGetSuccess) + \n +
+Number of failed Get's: +
OString::number(m_nGetFail) + \n +
+Number or reordering (LRU): +
OString::number(m_nToTop) + \n +
+Number of suppressions: +
OString::number(m_nDelete) + \n +
+Number of Get's
[PATCH] Removed last RTL_CONST* macros from codemaker
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2605
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/05/2605/1
Removed last RTL_CONST* macros from codemaker
Also, change .equals fro == and drop a useless function.
Change-Id: I5ce4fd2cc7c62a18e059e945b42cc01425802aa0
---
M codemaker/source/codemaker/codemaker.cxx
M codemaker/source/codemaker/typemanager.cxx
M codemaker/source/cppumaker/cppumaker.cxx
M codemaker/source/cppumaker/cpputype.cxx
M codemaker/source/javamaker/classfile.cxx
M codemaker/source/javamaker/javamaker.cxx
M codemaker/source/javamaker/javatype.cxx
7 files changed, 60 insertions(+), 80 deletions(-)
diff --git a/codemaker/source/codemaker/codemaker.cxx
b/codemaker/source/codemaker/codemaker.cxx
index b6169b8..bf5b618 100644
--- a/codemaker/source/codemaker/codemaker.cxx
+++ b/codemaker/source/codemaker/codemaker.cxx
@@ -62,10 +62,6 @@
return s;
}
-OString errorMsg(OString const desc, OString const type) {
-return desc + type;
-}
-
codemaker::UnoType::Sort decomposeAndResolve(
TypeManager const manager, rtl::OString const type,
bool resolveTypedefs, bool allowVoid, bool allowExtraEntities,
@@ -78,7 +74,7 @@
sal_Int32 n = 0;
*name = codemaker::UnoType::decompose(t, n, arguments);
if (n SAL_MAX_INT32 - *rank) {
-throw CannotDumpException(errorMsg(Bad type information: ,
type));
+throw CannotDumpException(Bad type information: + type);
//TODO
}
*rank += n;
@@ -90,7 +86,7 @@
switch (sort) {
case codemaker::UnoType::SORT_VOID:
if (!allowVoid) {
-throw CannotDumpException( errorMsg(Bad type information: ,
type));
+throw CannotDumpException(Bad type information: + type);
//TODO
}
default:
@@ -113,7 +109,7 @@
|| (static_cast sal_uInt16 (arguments-size())
!= reader.getReferenceCount(
{
-throw CannotDumpException(errorMsg(Bad type information:
, type));
+throw CannotDumpException(Bad type information: + type);
//TODO
}
return sort;
@@ -124,7 +120,7 @@
case RT_TYPE_SINGLETON:
case RT_TYPE_CONSTANTS:
if (!allowExtraEntities) {
-throw CannotDumpException(errorMsg(Bad type information:
, type));
+throw CannotDumpException(Bad type information: + type);
//TODO
}
checkNoTypeArguments(*arguments);
@@ -146,7 +142,7 @@
}
}
default:
-throw CannotDumpException(errorMsg(Bad type information: ,
type));
+throw CannotDumpException(Bad type information: + type);
//TODO
}
}
diff --git a/codemaker/source/codemaker/typemanager.cxx
b/codemaker/source/codemaker/typemanager.cxx
index d223e48..4e53e5f 100644
--- a/codemaker/source/codemaker/typemanager.cxx
+++ b/codemaker/source/codemaker/typemanager.cxx
@@ -56,35 +56,35 @@
sal_Bool TypeManager::isBaseType(const ::rtl::OString name)
{
-if ( name.equals(OString(short)) )
+if ( name == short )
return sal_True;
-if ( name.equals(OString(unsigned short)) )
+if ( name == unsigned short )
return sal_True;
-if ( name.equals(OString(long)) )
+if ( name == long )
return sal_True;
-if ( name.equals(OString(unsigned long)) )
+if ( name == unsigned long )
return sal_True;
-if ( name.equals(OString(hyper)) )
+if ( name == hyper )
return sal_True;
-if ( name.equals(OString(unsigned hyper)) )
+if ( name == unsigned hyper )
return sal_True;
-if ( name.equals(OString(string)) )
+if ( name == string )
return sal_True;
-if ( name.equals(OString(boolean)) )
+if ( name == boolean )
return sal_True;
-if ( name.equals(OString(char)) )
+if ( name == char )
return sal_True;
-if ( name.equals(OString(byte)) )
+if ( name == byte )
return sal_True;
-if ( name.equals(OString(any)) )
+if ( name == any )
return sal_True;
-if ( name.equals(OString(type)) )
+if ( name == type )
return sal_True;
-if ( name.equals(OString(float)) )
+if ( name == float )
return sal_True;
-if ( name.equals(OString(double)) )
+if ( name == double )
return sal_True;
-if ( name.equals(OString(void)) )
+if ( name == void )
return sal_True;
return sal_False;
@@ -355,10 +355,10 @@
{
RegistryKeyList keyList= RegistryKeyList();
OString tmpName;
-if ( name_.equals(/) || name_.equals(m_pImpl-m_base) ) {
+if ( name_ == / || name_ ==
[PATCH] fdo#57950: Remove chained appends in codemaker
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2583
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/83/2583/1
fdo#57950: Remove chained appends in codemaker
And another cleanups like removing RTL_CONST* macros and other simple
things.
Much more can be done inside codemaker.
Change-Id: I338e1c0e88558124741c6202896355533535a129
---
M codemaker/source/codemaker/codemaker.cxx
M codemaker/source/commoncpp/commoncpp.cxx
M codemaker/source/commonjava/commonjava.cxx
M codemaker/source/cppumaker/cpputype.cxx
M codemaker/source/javamaker/javatype.cxx
5 files changed, 44 insertions(+), 108 deletions(-)
diff --git a/codemaker/source/codemaker/codemaker.cxx
b/codemaker/source/codemaker/codemaker.cxx
index 454f59c..6c203bf 100644
--- a/codemaker/source/codemaker/codemaker.cxx
+++ b/codemaker/source/codemaker/codemaker.cxx
@@ -66,11 +66,8 @@
return s;
}
-rtl::OString errorMsg(rtl::OString const desc, rtl::OString const type) {
-rtl::OStringBuffer msg(128);
-msg.append(desc);
-msg.append(type);
-return msg.makeStringAndClear();
+OString errorMsg(OString const desc, OString const type) {
+return desc + type;
}
codemaker::UnoType::Sort decomposeAndResolve(
diff --git a/codemaker/source/commoncpp/commoncpp.cxx
b/codemaker/source/commoncpp/commoncpp.cxx
index 989052d..5db10d4 100644
--- a/codemaker/source/commoncpp/commoncpp.cxx
+++ b/codemaker/source/commoncpp/commoncpp.cxx
@@ -37,7 +37,7 @@
namespace codemaker { namespace cpp {
-rtl::OString scopedCppName(rtl::OString const type, bool ns_alias)
+OString scopedCppName(OString const type, bool ns_alias)
{
char c('/');
sal_Int32 nPos = type.lastIndexOf( c );
@@ -49,12 +49,11 @@
c = '.';
}
-rtl::OStringBuffer tmpBuf(type.getLength()*2);
+OStringBuffer tmpBuf(type.getLength()*2);
nPos = 0;
do
{
-tmpBuf.append(::);
-tmpBuf.append(type.getToken(0, c, nPos));
+tmpBuf.append(:: + type.getToken(0, c, nPos));
} while( nPos != -1 );
rtl::OString s(tmpBuf.makeStringAndClear());
@@ -67,16 +66,16 @@
}
-rtl::OString translateUnoToCppType(
+OString translateUnoToCppType(
codemaker::UnoType::Sort sort, RTTypeClass typeClass,
-rtl::OString const nucleus, bool shortname)
+OString const nucleus, bool shortname)
{
rtl::OStringBuffer buf;
if (sort == codemaker::UnoType::SORT_COMPLEX) {
if (typeClass == RT_TYPE_INTERFACE
nucleus == rtl::OString(com/sun/star/uno/XInterface))
{
-
buf.append(RTL_CONSTASCII_STRINGPARAM(::com::sun::star::uno::XInterface));
+buf.append(::com::sun::star::uno::XInterface);
} else {
//TODO: check that nucleus is a valid (UTF-8) identifier
buf.append(nucleus);
@@ -303,10 +302,7 @@
|| unoIdentifier == NDEBUG
|| (forbidden != 0 unoIdentifier == *forbidden) )
{
-rtl::OStringBuffer buf(prefix);
-buf.append('_');
-buf.append(unoIdentifier);
-return buf.makeStringAndClear();
+return prefix + _ + unoIdentifier;
} else {
return unoIdentifier;
}
diff --git a/codemaker/source/commonjava/commonjava.cxx
b/codemaker/source/commonjava/commonjava.cxx
index 8c01be9..e5f6eca 100644
--- a/codemaker/source/commonjava/commonjava.cxx
+++ b/codemaker/source/commonjava/commonjava.cxx
@@ -39,16 +39,15 @@
namespace codemaker { namespace java {
-rtl::OString translateUnoToJavaType(
+OString translateUnoToJavaType(
codemaker::UnoType::Sort sort, RTTypeClass typeClass,
-rtl::OString const nucleus, bool referenceType)
+OString const nucleus, bool referenceType)
{
-rtl::OStringBuffer buf;
+OStringBuffer buf;
if (sort == codemaker::UnoType::SORT_COMPLEX) {
-if (typeClass == RT_TYPE_INTERFACE
- nucleus == rtl::OString(com/sun/star/uno/XInterface))
+if (typeClass == RT_TYPE_INTERFACE nucleus ==
com/sun/star/uno/XInterface)
{
-buf.append(RTL_CONSTASCII_STRINGPARAM(java/lang/Object));
+buf.append(java/lang/Object);
} else {
//TODO: check that nucleus is a valid (Java-modified UTF-8)
// identifier
@@ -145,10 +144,7 @@
|| identifier == volatile
|| identifier == while)
{
-rtl::OStringBuffer buf(prefix);
-buf.append('_');
-buf.append(identifier);
-return buf.makeStringAndClear();
+return prefix + _ + identifier;
} else {
return identifier;
}
diff --git a/codemaker/source/cppumaker/cpputype.cxx
b/codemaker/source/cppumaker/cpputype.cxx
index 29516c8..6ee5f9e 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -403,13 +403,10 @@
OStringBuffer tmpBuf(length);
-tmpBuf.append(INCLUDED_);
-tmpBuf.append(m_typeName);
-
[PATCH] fdo#61513: Remove FSysFailOnErrorImpl macro
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2535
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/35/2535/1
fdo#61513: Remove FSysFailOnErrorImpl macro
This patch removes all used of this useless macro.
Change-Id: Ib3842ef28ea676e75b18c192f8d9610dcb3c3d0c
---
M tools/source/fsys/dirent.cxx
M tools/source/fsys/tdir.cxx
M tools/source/fsys/unx.hxx
M tools/source/fsys/wntmsc.cxx
M tools/source/fsys/wntmsc.hxx
5 files changed, 0 insertions(+), 18 deletions(-)
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index c4ae7a9..d00ed7c 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -768,7 +768,6 @@
return sal_True;
#endif
-FSysFailOnErrorImpl();
DirEntryKind eKind = FileStat( *this, nAccess ).GetKind();
if ( eKind ( FSYS_KIND_FILE | FSYS_KIND_DIR ) )
{
@@ -787,8 +786,6 @@
sal_Bool DirEntry::First()
{
-FSysFailOnErrorImpl();
-
StringaUniPathName( GetPath().GetFull() );
rtl::OString aPathName(rtl::OUStringToOString(aUniPathName,
osl_getThreadTextEncoding()));
@@ -1454,7 +1451,6 @@
return sal_True;
else
{
-FSysFailOnErrorImpl();
String aDirName(pNewDir-GetFull());
rtl::OString
bDirName(rtl::OUStringToOString(aDirName, osl_getThreadTextEncoding()));
@@ -1518,7 +1514,6 @@
return FSYS_ERR_ALREADYEXISTS;
}
-FSysFailOnErrorImpl();
String aFrom( GetFull() );
String aTo( aDest.GetFull() );
@@ -1649,7 +1644,6 @@
DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
FSysError eError = FSYS_ERR_OK;
-FSysFailOnErrorImpl();
// Terminate name string with two '0'
String aTmpName( GetFull() );
diff --git a/tools/source/fsys/tdir.cxx b/tools/source/fsys/tdir.cxx
index b33c9cf..5e6ed05 100644
--- a/tools/source/fsys/tdir.cxx
+++ b/tools/source/fsys/tdir.cxx
@@ -289,7 +289,6 @@
{
sal_uInt16 nRead = 0; // Number of read entries in this round
-FSysFailOnErrorImpl();
// did not complete
if ( pReader )
diff --git a/tools/source/fsys/unx.hxx b/tools/source/fsys/unx.hxx
index 9728d71..8a3ee3b 100644
--- a/tools/source/fsys/unx.hxx
+++ b/tools/source/fsys/unx.hxx
@@ -71,8 +71,6 @@
rDate = Date( pTime-tm_mday, pTime-tm_mon + 1, pTime-tm_year + 1900 );
}
-#define FSysFailOnErrorImpl()
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/source/fsys/wntmsc.cxx b/tools/source/fsys/wntmsc.cxx
index 7c74ed4..f6c9e0e 100644
--- a/tools/source/fsys/wntmsc.cxx
+++ b/tools/source/fsys/wntmsc.cxx
@@ -114,7 +114,6 @@
char *pOld;
rtl::OString aFullName(rtl::OUStringToOString(GetFull(),
osl_getThreadTextEncoding()));
-FSysFailOnErrorImpl();
if ( GetFullPathName(aFullName.getStr(), 256, sBuf, pOld) 511 )
return sal_False;
@@ -143,7 +142,6 @@
DWORD nMaxCompLen[2];
DWORD nFlags[2];
rtl::OString aRootDir = pTop-aName;
-FSysFailOnErrorImpl();
// Try network device first due to slow samba drives
if ( !WNetGetConnection( aRootDir.getStr(),
@@ -168,8 +166,6 @@
sal_Bool DirEntry::SetCWD( sal_Bool bSloppy ) const
{
DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
-
-FSysFailOnErrorImpl();
if ( eFlag == FSYS_FLAG_CURRENT !aName.getLength() )
return sal_True;
@@ -593,9 +589,6 @@
nError = FSYS_ERR_OK;
return sal_True;
}
-
-// Don't show error boxes
-FSysFailOnErrorImpl();
// Redirect
String aPath( rDirEntry.GetFull() );
diff --git a/tools/source/fsys/wntmsc.hxx b/tools/source/fsys/wntmsc.hxx
index bb1dbac..bf83941 100644
--- a/tools/source/fsys/wntmsc.hxx
+++ b/tools/source/fsys/wntmsc.hxx
@@ -63,8 +63,6 @@
return GetDriveType( aDriveRoot.getStr() ) 1;
}
-#define FSysFailOnErrorImpl()
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--
To view, visit https://gerrit.libreoffice.org/2535
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib3842ef28ea676e75b18c192f8d9610dcb3c3d0c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza marcos.souza@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#57950: Remove more chained appends in filter
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2186
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/86/2186/1
fdo#57950: Remove more chained appends in filter
And also sanitize some OUStringBuffer uses.
Change-Id: I338b18981e1f925d76c0d640159de30bab219122
---
M filter/source/msfilter/msvbahelper.cxx
M filter/source/msfilter/svdfppt.cxx
M filter/source/pdf/pdfexport.cxx
M filter/source/svg/svgwriter.cxx
M filter/source/svg/test/odfserializer.cxx
M filter/source/xsltfilter/XSLTFilter.cxx
6 files changed, 17 insertions(+), 45 deletions(-)
diff --git a/filter/source/msfilter/msvbahelper.cxx
b/filter/source/msfilter/msvbahelper.cxx
index 9b8353d..e143ba4 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -48,11 +48,7 @@
OUString makeMacroURL( const OUString sMacroName )
{
-return OUStringBuffer().
-append( sUrlPart0 ).
-append( sMacroName ).
-append( sUrlPart1 ).
-makeStringAndClear();
+return sUrlPart0 + sMacroName + sUrlPart1;
}
OUString extractMacroName( const OUString rMacroUrl )
@@ -282,7 +278,7 @@
OUString aLibName = rLibName.isEmpty() ? getDefaultProjectName(
pShell ) : rLibName ;
OUString aModuleName = rModuleName;
if( hasMacro( pShell, aLibName, aModuleName, rMacroName ) )
-return OUStringBuffer( aLibName ).append( sal_Unicode( '.' )
).append( aModuleName ).append( sal_Unicode( '.' ) ).append( rMacroName
).makeStringAndClear();
+return aLibName + . + aModuleName + . + rMacroName;
}
#endif
return OUString();
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 057f7e5..b307db4 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -4110,24 +4110,20 @@
{
if ( rIn.GetError() == 0 )
{
-rtl::OStringBuffer aMsg;
+OStringBuffer aMsg;
if ( rIn.Tell() aTxMasterStyleHd.GetRecEndFilePos() )
{
-aMsg.append(RTL_CONSTASCII_STRINGPARAM(\n ));
-aMsg.append(RTL_CONSTASCII_STRINGPARAM(reading too
many bytes:));
-aMsg.append(static_castsal_Int32(rIn.Tell() -
aTxMasterStyleHd.GetRecEndFilePos()));
+aMsg.append(\n + reading too many bytes: +
+OString::number(rIn.Tell() -
aTxMasterStyleHd.GetRecEndFilePos()));
}
if ( rIn.Tell() aTxMasterStyleHd.GetRecEndFilePos() )
{
-aMsg.append(RTL_CONSTASCII_STRINGPARAM(\n ));
-aMsg.append(RTL_CONSTASCII_STRINGPARAM(reading too
few bytes:));
-
aMsg.append(static_castsal_Int32(aTxMasterStyleHd.GetRecEndFilePos() -
rIn.Tell()));
+aMsg.append(\n + reading too few bytes: +
+
OString::number(aTxMasterStyleHd.GetRecEndFilePos() - rIn.Tell()));
}
if (aMsg.getLength())
{
-aMsg.insert(0, RTL_CONSTASCII_STRINGPARAM(]:));
-aMsg.insert(0, RTL_CONSTASCII_STRINGPARAM(
-PptStyleSheet::operator[));
+aMsg.insert(0, PptStyleSheet::operator[]);
OSL_FAIL(aMsg.getStr());
}
}
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index c9f3133..57d538b 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -878,10 +878,7 @@
if( aPageRange.isEmpty() )
{
-aPageRange = OUStringBuffer()
-.append( static_cast sal_Int32 ( 1 ) )
-.append( static_cast sal_Unicode ( '-' ) )
-.append( nPageCount ).makeStringAndClear();
+aPageRange = OUString::number( 1 ) + - +
OUString::number(nPageCount );
}
StringRangeEnumerator aRangeEnum( aPageRange, 0, nPageCount-1
);
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 8ba1446..14e115e 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -2935,8 +2935,7 @@
{
SvXMLElementExport aElem( mrExport,
XML_NAMESPACE_NONE, desc, sal_False, sal_False );
-OUStringBuffer sType;
-sType.append(static_castsal_Int32(nType));
+OUStringBuffer sType(OUString::number(nType));
if (pAction (nType == META_COMMENT_ACTION))
{
sType.append(: );
@@
[PATCH] Remove not needed function in calc
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2187
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/87/2187/1
Remove not needed function in calc
Change-Id: I0be7d751a52d11687c15042023b7a6ebb0122c64
---
M sc/source/ui/collab/sendfunc.hxx
1 file changed, 7 insertions(+), 15 deletions(-)
diff --git a/sc/source/ui/collab/sendfunc.hxx b/sc/source/ui/collab/sendfunc.hxx
index f7fcca9..6bd9a1e 100644
--- a/sc/source/ui/collab/sendfunc.hxx
+++ b/sc/source/ui/collab/sendfunc.hxx
@@ -34,17 +34,12 @@
// method name ';' then arguments ; separated
class ScChangeOpWriter
{
-rtl::OUStringBuffer aMessage;
-void appendSeparator()
-{
-aMessage.append( sal_Unicode( ';' ) );
-}
+OUStringBuffer aMessage;
public:
ScChangeOpWriter( const char *pName )
{
-aMessage.appendAscii( pName );
-appendSeparator();
+aMessage.append( OUString(pName ) + ;);
}
void appendString( const rtl::OUString rStr )
@@ -58,27 +53,24 @@
}
else
aMessage.append( rStr );
-appendSeparator();
+aMessage.append(;);
}
void appendAddress( const ScAddress rPos )
{
-rtl::OUString aStr;
+OUString aStr;
rPos.Format( aStr, SCA_VALID );
-aMessage.append( aStr );
-appendSeparator();
+aMessage.append( aStr + ; );
}
void appendInt( sal_Int32 i )
{
-aMessage.append( i );
-appendSeparator();
+aMessage.append( OUString::number(i) + ; );
}
void appendBool( sal_Bool b )
{
-aMessage.appendAscii( b ? true : false );
-appendSeparator();
+aMessage.append( OUString(b ? true : false ) + ;;
}
void appendCell( ScBaseCell *pCell )
--
To view, visit https://gerrit.libreoffice.org/2187
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0be7d751a52d11687c15042023b7a6ebb0122c64
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza marcos.souza@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#57950: Remove some chained appends in filter
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2117
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/17/2117/1
fdo#57950: Remove some chained appends in filter
Change-Id: I2386eb47ad7190d626966020e96c1a7ddc07ab4a
---
M dictionaries
M filter/source/config/cache/filtercache.cxx
M filter/source/config/cache/filterfactory.cxx
M filter/source/svg/svgwriter.cxx
M helpcontent2
5 files changed, 31 insertions(+), 87 deletions(-)
diff --git a/dictionaries b/dictionaries
index 350dc59..0aeb113 16
--- a/dictionaries
+++ b/dictionaries
-Subproject commit 350dc590b04041f15d6c570075ade425e4db93ad
+Subproject commit 0aeb113339d2bdeb0cb7fe3a9a2b1ae1c3fd9367
diff --git a/filter/source/config/cache/filtercache.cxx
b/filter/source/config/cache/filtercache.cxx
index 7ae9377..1e45cfb 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -412,11 +412,9 @@
if ( !bIsHelpFilter !impl_isModuleInstalled(sDocService) )
{
-::rtl::OUStringBuffer sMsg(256);
-sMsg.appendAscii(The requested filter '
);
-sMsg.append (sItem
);
-sMsg.appendAscii(' exists ... but it shouldnt; because the
corresponding OOo module was not installed.);
-throw
css::container::NoSuchElementException(sMsg.makeStringAndClear(),
css::uno::Reference css::uno::XInterface ());
+OUString sMsg(The requested filter ' + sItem +
+ ' exists ... but it shouldnt; because the
corresponding OOo module was not installed.);
+throw css::container::NoSuchElementException(sMsg,
css::uno::Reference css::uno::XInterface ());
}
}
@@ -1039,7 +1037,7 @@
// If there are some real errors throw a RuntimException!
// If there are some warnings only, show an assertion.
sal_Int32 nErrors = 0;
-::rtl::OUStringBuffer sLog(256);
+OUStringBuffer sLog(256);
CacheItemList::iterator pIt;
@@ -1074,19 +1072,13 @@
aType[PROPNAME_NAME] = sInternalTypeNameCheck;
if (!sInternalTypeNameCheck.equals(sType))
{
-sLog.appendAscii(Warning\t:\t);
-sLog.appendAscii(The type \ );
-sLog.append (sType );
-sLog.appendAscii(\ does support the property \Name\
correctly.\n);
+sLog.append(Warning\t:\t The type \ + sType + \ does
support the property \Name\ correctly.\n);
++nWarnings;
}
if (!ce !cu)
{
-sLog.appendAscii(Warning\t:\t);
-sLog.appendAscii(The type \ );
-sLog.append (sType );
-sLog.appendAscii(\ does not contain any URL pattern nor any
extensions.\n);
+sLog.append(Warning\t:\t The type \ + sType + \ does not
contain any URL pattern nor any extensions.\n);
++nWarnings;
}
#endif
@@ -1162,10 +1154,7 @@
(!bReferencedByHandler)
)
{
-sLog.appendAscii(Warning\t:\t
);
-sLog.appendAscii(The type \
);
-sLog.append (sType
);
-sLog.appendAscii(\ isnt used by any filter, loader or
content handler.\n);
+sLog.append(Warning\t:\t The type \ + sType + \ isnt
used by any filter, loader or content handler.\n);
++nWarnings;
}
}
@@ -1178,20 +1167,15 @@
if (bAllFiltersShouldExist)
{
++nWarnings; // preferred filters can point to a
non-installed office module ! no error ... it's a warning only .-(
-sLog.appendAscii(error\t:\t);
+sLog.append(error\t:\t);
}
else
{
++nWarnings;
-sLog.appendAscii(warning\t:\t);
+sLog.append(warning\t:\t);
}
-sLog.appendAscii(The type \ );
-sLog.append (sType );
-sLog.appendAscii(\ points to an invalid filter \);
-sLog.append (sPrefFilter);
-sLog.appendAscii(\.\n);
-
+sLog.append(The type \ + sType + \ points to an invalid
filter \ + sPrefFilter + \.\n);
continue;
}
@@ -1200,14 +1184,8 @@
aPrefFilter[PROPNAME_TYPE] = sFilterTypeReg;
if (sFilterTypeReg != sType)
{
-
Change in core[master]: Use a method from UnoApitest instead of implement a new one ...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1923
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/23/1923/1
Use a method from UnoApitest instead of implement a new one in calc
In calc, we see a lot of implementations of createFileURL. So get ride
of all it and start to use the UnoAPitest::createFileURL method.
Also, clean the UnoApiRest::createFileURL method, fix the path from UnoApiTest
and
moved some testing files to the right dir that the file belongs.
Change-Id: Ic02f13777503729ac70da590f4a42866f17ea9b2
---
M sc/CppunitTest_sc_macros_test.mk
M sc/Module_sc.mk
M sc/qa/extras/macros-test.cxx
M sc/qa/extras/scannotationobj.cxx
M sc/qa/extras/scannotationsobj.cxx
M sc/qa/extras/sccellrangeobj.cxx
M sc/qa/extras/scdatabaserangeobj.cxx
M sc/qa/extras/scdatapilotfieldobj.cxx
M sc/qa/extras/scdatapilottableobj.cxx
M sc/qa/extras/sceditfieldobj-cell.cxx
M sc/qa/extras/sceditfieldobj-header.cxx
M sc/qa/extras/scmodelobj.cxx
M sc/qa/extras/scnamedrangeobj.cxx
M sc/qa/extras/scnamedrangesobj.cxx
M sc/qa/extras/scoutlineobj.cxx
M sc/qa/extras/sctablesheetobj.cxx
M sc/qa/extras/sctablesheetsobj.cxx
D sc/qa/unit/data/ods/StarBasic.ods
D sc/qa/unit/data/xls/TestAddress.xls
M test/inc/test/unoapi_test.hxx
M test/source/unoapi_test.cxx
21 files changed, 57 insertions(+), 41 deletions(-)
diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk
index 362a65e..66dd619 100644
--- a/sc/CppunitTest_sc_macros_test.mk
+++ b/sc/CppunitTest_sc_macros_test.mk
@@ -59,6 +59,7 @@
svx \
svxcore \
test \
+subsequenttest \
tl \
tk \
ucbhelper \
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 4a4fc41..1b3ba05 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -59,8 +59,6 @@
# CppunitTest_sc_annotationshapeobj \
$(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
-JunitTest_sc_complex \
-JunitTest_sc_unoapi \
CppunitTest_sc_outlineobj \
CppunitTest_sc_annotationobj \
CppunitTest_sc_annotationsobj \
diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index 364ca1b..d6ccdb1 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -29,7 +29,7 @@
*/
#include sal/config.h
-#include test/bootstrapfixture.hxx
+#include test/unoapi_test.hxx
#include unotest/macros_test.hxx
#include rtl/strbuf.hxx
#include osl/file.hxx
@@ -53,12 +53,10 @@
/* Implementation of Macros test */
-class ScMacrosTest : public test::BootstrapFixture, public unotest::MacrosTest
+class ScMacrosTest : public UnoApiTest
{
public:
ScMacrosTest();
-
-void createFileURL(const rtl::OUString aFileBase, const rtl::OUString
aFileExtension, rtl::OUString rFilePath);
virtual void setUp();
virtual void tearDown();
@@ -77,25 +75,13 @@
private:
uno::Referenceuno::XInterface m_xCalcComponent;
-rtl::OUString m_aBaseString;
};
-
-
-void ScMacrosTest::createFileURL(const rtl::OUString aFileBase, const
rtl::OUString aFileExtension, rtl::OUString rFilePath)
-{
-rtl::OUString aSep(RTL_CONSTASCII_USTRINGPARAM(/));
-rtl::OUStringBuffer aBuffer( getSrcRootURL() );
-aBuffer.append(m_aBaseString).append(aSep).append(aFileExtension);
-aBuffer.append(aSep).append(aFileBase).append(aFileExtension);
-rFilePath = aBuffer.makeStringAndClear();
-}
void ScMacrosTest::testStarBasic()
{
-const rtl::OUString
aFileNameBase(RTL_CONSTASCII_USTRINGPARAM(StarBasic.));
-rtl::OUString aFileExtension(ods);
+const OUString aFileNameBase(StarBasic.ods);
rtl::OUString aFileName;
-createFileURL(aFileNameBase, aFileExtension, aFileName);
+createFileURL(aFileNameBase, aFileName);
std::cout StarBasic test std::endl;
uno::Reference com::sun::star::lang::XComponent xComponent =
loadFromDesktop(aFileName);
@@ -136,11 +122,10 @@
}
};
-rtl::OUString aFileExtension(xls);
for ( sal_uInt32 i=0; iSAL_N_ELEMENTS( testInfo ); ++i )
{
rtl::OUString aFileName;
-createFileURL(testInfo[i].sFileBaseName, aFileExtension, aFileName);
+createFileURL(testInfo[i].sFileBaseName + xls, aFileName);
uno::Reference com::sun::star::lang::XComponent xComponent =
loadFromDesktop(aFileName);
rtl::OUString sMsg( Failed to load + aFileName );
CPPUNIT_ASSERT_MESSAGE( rtl::OUStringToOString( sMsg,
RTL_TEXTENCODING_UTF8 ).getStr(), xComponent.is() );
@@ -164,7 +149,7 @@
}
ScMacrosTest::ScMacrosTest()
- : m_aBaseString(RTL_CONSTASCII_USTRINGPARAM(/sc/qa/unit/data))
+ : UnoApiTest(/sc/qa/extras/testdocuments)
{
}
diff --git a/sc/qa/extras/scannotationobj.cxx b/sc/qa/extras/scannotationobj.cxx
index 29d9cbf..fdbd748 100644
--- a/sc/qa/extras/scannotationobj.cxx
+++ b/sc/qa/extras/scannotationobj.cxx
@@ -70,6 +70,7 @@
uno::Reference lang::XComponent ScAnnontationObj::mxComponent;
Change in core[master]: Remove more STRINGPARAM macros form dbaccess
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1878
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/78/1878/1
Remove more STRINGPARAM macros form dbaccess
Change-Id: I283ccd03dc811dda2f10963f400cd517f42ea7b3
---
M dbaccess/source/core/dataaccess/databasecontext.cxx
M dbaccess/source/core/dataaccess/databaseregistrations.cxx
M dbaccess/source/core/dataaccess/definitioncontainer.cxx
M dbaccess/source/core/dataaccess/documentcontainer.cxx
M dbaccess/source/core/dataaccess/intercept.cxx
M dbaccess/source/core/dataaccess/myucp_datasupplier.cxx
M dbaccess/source/core/misc/DatabaseDataProvider.cxx
M dbaccess/source/core/misc/dsntypes.cxx
M dbaccess/source/core/misc/sdbcoretools.cxx
M dbaccess/source/core/recovery/dbdocrecovery.cxx
M dbaccess/source/core/recovery/settingsimport.cxx
M dbaccess/source/core/recovery/storagetextstream.cxx
M dbaccess/source/core/recovery/subcomponentloader.cxx
M dbaccess/source/core/recovery/subcomponentrecovery.cxx
14 files changed, 95 insertions(+), 126 deletions(-)
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx
b/dbaccess/source/core/dataaccess/databasecontext.cxx
index b5372d4..8144f82 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -204,10 +204,9 @@
}
// Helper
-rtl::OUString ODatabaseContext::getImplementationName_static() throw(
RuntimeException )
-
+OUString ODatabaseContext::getImplementationName_static() throw(
RuntimeException )
{
-return
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.comp.dba.ODatabaseContext));
+return OUString(com.sun.star.comp.dba.ODatabaseContext);
}
Reference XInterface ODatabaseContext::Create(const Reference
XComponentContext _rxContext)
diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.cxx
b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
index 344c15c..5886fbd 100644
--- a/dbaccess/source/core/dataaccess/databaseregistrations.cxx
+++ b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
@@ -53,21 +53,21 @@
using ::com::sun::star::uno::XAggregation;
/** === end UNO using === **/
-static const ::rtl::OUString getConfigurationRootPath()
+static const OUString getConfigurationRootPath()
{
-static ::rtl::OUString
s_sNodeName(RTL_CONSTASCII_USTRINGPARAM(org.openoffice.Office.DataAccess/RegisteredNames));
+static OUString
s_sNodeName(org.openoffice.Office.DataAccess/RegisteredNames);
return s_sNodeName;
}
-const ::rtl::OUString getLocationNodeName()
+const OUString getLocationNodeName()
{
-static ::rtl::OUString
s_sNodeName(RTL_CONSTASCII_USTRINGPARAM(Location));
+static OUString s_sNodeName(Location);
return s_sNodeName;
}
-const ::rtl::OUString getNameNodeName()
+const OUString getNameNodeName()
{
-static ::rtl::OUString
s_sNodeName(RTL_CONSTASCII_USTRINGPARAM(Name));
+static OUString s_sNodeName(Name);
return s_sNodeName;
}
diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx
b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
index 928f2cf..8c8cd98 100644
--- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx
+++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
@@ -159,16 +159,16 @@
IMPLEMENT_FORWARD_XINTERFACE2(
ODefinitionContainer,OContentHelper,ODefinitionContainer_Base)
IMPLEMENT_TYPEPROVIDER2(ODefinitionContainer,OContentHelper,ODefinitionContainer_Base);
// XServiceInfo
-::rtl::OUString SAL_CALL ODefinitionContainer::getImplementationName( )
throw(RuntimeException)
+OUString SAL_CALL ODefinitionContainer::getImplementationName( )
throw(RuntimeException)
{
-return
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.sdb.ODefinitionContainer));
+return OUString(com.sun.star.sdb.ODefinitionContainer);
}
-Sequence ::rtl::OUString SAL_CALL
ODefinitionContainer::getSupportedServiceNames( ) throw(RuntimeException)
+Sequence OUString SAL_CALL ODefinitionContainer::getSupportedServiceNames(
) throw(RuntimeException)
{
-Sequence ::rtl::OUString aReturn(2);
-aReturn.getArray()[0] =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.sdb.DefinitionContainer));
-aReturn.getArray()[1] =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.ucb.Content));
+Sequence OUString aReturn(2);
+aReturn.getArray()[0] = com.sun.star.sdb.DefinitionContainer;
+aReturn.getArray()[1] = com.sun.star.ucb.Content;
return aReturn;
}
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx
b/dbaccess/source/core/dataaccess/documentcontainer.cxx
index 9e91fd4..90a8af5 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
@@ -733,7 +733,7 @@
{
Command aCommand;
-
[PATCH] Only call getScDocument when needed
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1861
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/61/1861/1
Only call getScDocument when needed
Change-Id: I2dca76af46e63b5dd833f5a60549d4b1a7b03d84
---
M sc/source/filter/oox/stylesbuffer.cxx
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sc/source/filter/oox/stylesbuffer.cxx
b/sc/source/filter/oox/stylesbuffer.cxx
index bb3672d..3657f9b 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -2715,11 +2715,11 @@
if( !mbCreated )
mbCreated = maFinalName.isEmpty();
-::ScDocument rDoc = getScDocument();
if( !mbCreated !mpStyleSheet )
{
bool bCreatePattern = false;
Xf* pXF = getStyles().getStyleXf( maModel.mnXfId ).get();
+::ScDocument rDoc = getScDocument();
bool bDefStyle = maModel.isDefaultStyle();
if( bDefStyle )
--
To view, visit https://gerrit.libreoffice.org/1861
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2dca76af46e63b5dd833f5a60549d4b1a7b03d84
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza marcos.souza@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Remove some RTL_* macdros from connectivity and..
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1767
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/67/1767/1
Remove some RTL_* macdros from connectivity and..
...also simplify a lot some functions calls.
Change-Id: I07029055a7cbe0d1ea2e6c891e6c7347e3a370a9
---
M connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
1 file changed, 138 insertions(+), 466 deletions(-)
diff --git
a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
index 54dffa5..470d27a 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
@@ -30,11 +30,10 @@
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
-// -
ODatabaseMetaDataResultSetMetaData::~ODatabaseMetaDataResultSetMetaData()
{
}
-// -
+
sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnDisplaySize(
sal_Int32 column ) throw(SQLException, RuntimeException)
{
if(m_mColumns.size() (m_mColumnsIter = m_mColumns.find(column)) !=
m_mColumns.end())
@@ -42,7 +41,6 @@
return 0;
}
-// -
sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnType(
sal_Int32 column ) throw(SQLException, RuntimeException)
{
@@ -50,13 +48,11 @@
return (*m_mColumnsIter).second.getColumnType();
return 1;
}
-// -
sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnCount( )
throw(SQLException, RuntimeException)
{
return m_mColumns.size();
}
-// -
sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCaseSensitive(
sal_Int32 column ) throw(SQLException, RuntimeException)
{
@@ -64,13 +60,11 @@
return (*m_mColumnsIter).second.isCaseSensitive();
return sal_True;
}
-// -
::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getSchemaName(
sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
{
return ::rtl::OUString();
}
-// -
::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnName(
sal_Int32 column ) throw(SQLException, RuntimeException)
{
@@ -78,40 +72,39 @@
return (*m_mColumnsIter).second.getColumnName();
return ::rtl::OUString();
}
-// -
+
::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getTableName(
sal_Int32 column ) throw(SQLException, RuntimeException)
{
if(m_mColumns.size() (m_mColumnsIter = m_mColumns.find(column)) !=
m_mColumns.end())
return (*m_mColumnsIter).second.getTableName();
return ::rtl::OUString();
}
-// -
+
::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getCatalogName(
sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
{
return ::rtl::OUString();
}
-// -
+
::rtl::OUString SAL_CALL
ODatabaseMetaDataResultSetMetaData::getColumnTypeName( sal_Int32 column )
throw(SQLException, RuntimeException)
{
if(m_mColumns.size() (m_mColumnsIter = m_mColumns.find(column)) !=
m_mColumns.end())
return (*m_mColumnsIter).second.getColumnTypeName();
return ::rtl::OUString();
}
-// -
+
::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnLabel(
sal_Int32 column ) throw(SQLException, RuntimeException)
{
if(m_mColumns.size() (m_mColumnsIter = m_mColumns.find(column)) !=
m_mColumns.end())
return (*m_mColumnsIter).second.getColumnLabel();
return getColumnName(column);
}
-// -
+
::rtl::OUString SAL_CALL
ODatabaseMetaDataResultSetMetaData::getColumnServiceName( sal_Int32 column )
throw(SQLException, RuntimeException)
{
if(m_mColumns.size() (m_mColumnsIter = m_mColumns.find(column)) !=
m_mColumns.end())
return (*m_mColumnsIter).second.getColumnServiceName();
return ::rtl::OUString();
}
-// -
sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCurrency( sal_Int32
column ) throw(SQLException, RuntimeException)
{
@@ -119,7 +112,6 @@
[PATCH] fdo#57950: Remove some chained appends in connectivity and..
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1768
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/68/1768/1
fdo#57950: Remove some chained appends in connectivity and..
... remove some RTL* macros.
Change-Id: I919d17e14334c9220b47775355512df8dfa00bca
---
M connectivity/source/drivers/postgresql/pq_xkeys.cxx
M connectivity/source/drivers/postgresql/pq_xtable.cxx
M connectivity/source/drivers/postgresql/pq_xtables.cxx
M connectivity/source/drivers/postgresql/pq_xuser.cxx
M connectivity/source/drivers/postgresql/pq_xusers.cxx
M connectivity/source/drivers/postgresql/pq_xview.cxx
M connectivity/source/drivers/postgresql/pq_xviews.cxx
7 files changed, 75 insertions(+), 215 deletions(-)
diff --git a/connectivity/source/drivers/postgresql/pq_xkeys.cxx
b/connectivity/source/drivers/postgresql/pq_xkeys.cxx
index 314924d..2a8d521 100644
--- a/connectivity/source/drivers/postgresql/pq_xkeys.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xkeys.cxx
@@ -98,7 +98,6 @@
namespace pq_sdbc_driver
{
-#define ASCII_STR(x) OUString( RTL_CONSTASCII_USTRINGPARAM( x ) )
Keys::Keys(
const ::rtl::Reference RefCountedMutex refMutex,
@@ -127,57 +126,16 @@
static sal_Int32 string2keyrule( const rtl::OUString rule )
{
sal_Int32 ret = com::sun::star::sdbc::KeyRule::NO_ACTION;
-if( rule.compareToAscii( RTL_CONSTASCII_STRINGPARAM( r ) ) == 0 )
+if( rule == r )
ret = com::sun::star::sdbc::KeyRule::RESTRICT;
-else if( rule.compareToAscii( RTL_CONSTASCII_STRINGPARAM( c ) ) == 0 )
+else if( rule == c )
ret = com::sun::star::sdbc::KeyRule::CASCADE;
-else if( rule.compareToAscii( RTL_CONSTASCII_STRINGPARAM( n ) ) == 0 )
+else if( rule == n )
ret = com::sun::star::sdbc::KeyRule::SET_NULL;
-else if( rule.compareToAscii( RTL_CONSTASCII_STRINGPARAM( d ) ) == 0 )
+else if( rule == d )
ret = com::sun::star::sdbc::KeyRule::SET_DEFAULT;
return ret;
}
-
-
-
-// static void fillAttnum2attnameMap(
-// Int2StringMap map,
-// const Reference com::sun::star::sdbc::XConnection conn,
-// const rtl::OUString schema,
-// const rtl::OUString table )
-// {
-// Reference XPreparedStatement prep = conn-prepareStatement(
-// ASCII_STR( SELECT attname,attnum
-//FROM pg_attribute
-// INNER JOIN pg_class ON attrelid = pg_class.oid
-// INNER JOIN pg_namespace ON pg_class.relnamespace
= pg_namespace.oid
-//WHERE relname=? AND nspname=? ) );
-
-// Reference XParameters paras( prep, UNO_QUERY );
-// paras-setString( 1 , table );
-// paras-setString( 2 , schema );
-// Reference XResultSet rs = prep-executeQuery();
-
-// Reference XRow xRow( rs , UNO_QUERY );
-// while( rs-next() )
-// {
-// map[ xRow-getInt(2) ] = xRow-getString(1);
-// }
-// }
-
-// static Sequence rtl::OUString resolveColumnNames(
-// const Int2StringMap map, const rtl::OUString array )
-// {
-// Sequence sal_Int32 intArray = string2intarray( array );
-// Sequence ::rtl::OUString ret( intArray.getLength() );
-// for( int i = 0; i intArray.getLength() ; i ++ )
-// {
-// Int2StringMap::const_iterator ii = map.find( intArray[i] );
-// if( ii != map.end() )
-// ret[i] = ii-second;
-// }
-// return ret;
-// }
void Keys::refresh()
throw (::com::sun::star::uno::RuntimeException)
@@ -186,12 +144,10 @@
{
if( isLog( m_pSettings, LogLevel::INFO ) )
{
-rtl::OStringBuffer buf;
-buf.append( sdbcx.Keys get refreshed for table );
-buf.append( OUStringToOString( m_schemaName, m_pSettings-encoding
) );
-buf.append( . );
-buf.append( OUStringToOString( m_tableName,m_pSettings-encoding )
);
-log( m_pSettings, LogLevel::INFO,
buf.makeStringAndClear().getStr() );
+OString buf( sdbcx.Keys get refreshed for table +
+ OUStringToOString( m_schemaName,
m_pSettings-encoding ) +
+ . + OUStringToOString(
m_tableName,m_pSettings-encoding ));
+log( m_pSettings, LogLevel::INFO, buf.getStr() );
}
osl::MutexGuard guard( m_refMutex-mutex );
@@ -201,7 +157,6 @@
fillAttnum2attnameMap( mainMap, m_origin, m_schemaName, m_tableName );
Reference XPreparedStatement stmt = m_origin-prepareStatement(
-ASCII_STR(
SELECT conname, // 1
contype, // 2
confupdtype, // 3
@@ -214,7 +169,7 @@
INNER JOIN pg_namespace ON pg_class.relnamespace =
pg_namespace.oid
LEFT JOIN pg_class AS class2 ON confrelid = class2.oid
LEFT JOIN pg_namespace AS nmsp2 ON
[PATCH] Remove more STRINGPARAM macros from dbaccess
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1771
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/71/1771/1
Remove more STRINGPARAM macros from dbaccess
Change-Id: I5a5af27d7c980f6b71011c33531a49a82d79fbc8
---
M dbaccess/source/core/dataaccess/ContentHelper.cxx
M dbaccess/source/core/dataaccess/ModelImpl.cxx
M dbaccess/source/core/dataaccess/ModelImpl.hxx
M dbaccess/source/core/dataaccess/SharedConnection.hxx
M dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
M dbaccess/source/core/dataaccess/commandcontainer.cxx
M dbaccess/source/core/dataaccess/commanddefinition.cxx
M dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
8 files changed, 48 insertions(+), 77 deletions(-)
diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx
b/dbaccess/source/core/dataaccess/ContentHelper.cxx
index 20a535f..87b6480 100644
--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
@@ -93,10 +93,8 @@
Reference XContentIdentifier SAL_CALL OContentHelper::getIdentifier( )
throw (RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
-::rtl::OUStringBuffer aIdentifier;
-aIdentifier.appendAscii( private: );
-aIdentifier.append( impl_getHierarchicalName( true ) );
-return new ::ucbhelper::ContentIdentifier(
aIdentifier.makeStringAndClear() );
+OUString aIdentifier( private: + impl_getHierarchicalName( true ) );
+return new ::ucbhelper::ContentIdentifier( aIdentifier );
}
::rtl::OUString OContentHelper::impl_getHierarchicalName( bool
_includingRootContainer ) const
@@ -114,9 +112,7 @@
xProp-getPropertyValue( PROPERTY_NAME ) = sName;
::rtl::OUString sPrevious = aHierarchicalName.makeStringAndClear();
-aHierarchicalName.append( sName );
-aHierarchicalName.append( sal_Unicode( '/' ) );
-aHierarchicalName.append( sPrevious );
+aHierarchicalName.append( sName + / + sPrevious );
}
}
::rtl::OUString sHierarchicalName( aHierarchicalName.makeStringAndClear()
);
@@ -352,28 +348,19 @@
if ( rValue.Name == ContentType )
{
// Read-only property!
-aRet[ n ] = IllegalAccessException(
-::rtl::OUString(
-RTL_CONSTASCII_USTRINGPARAM(Property is
read-only!)
-),
+aRet[ n ] = IllegalAccessException(Property is read-only!,
static_cast cppu::OWeakObject * ( this ) );
}
else if ( rValue.Name == IsDocument )
{
// Read-only property!
-aRet[ n ] = IllegalAccessException(
-::rtl::OUString(
-RTL_CONSTASCII_USTRINGPARAM(Property is
read-only!)
-),
+aRet[ n ] = IllegalAccessException(Property is read-only!,
static_cast cppu::OWeakObject * ( this ) );
}
else if ( rValue.Name == IsFolder )
{
// Read-only property!
-aRet[ n ] = IllegalAccessException(
-::rtl::OUString(
-RTL_CONSTASCII_USTRINGPARAM(Property is
read-only!)
-),
+aRet[ n ] = IllegalAccessException(Property is read-only!,
static_cast cppu::OWeakObject * ( this ) );
}
else if ( rValue.Name == Title )
@@ -407,20 +394,14 @@
}
else
{
-aRet[ n ] = IllegalTypeException(
-::rtl::OUString(
-RTL_CONSTASCII_USTRINGPARAM(Property
value has wrong type!)
-),
+aRet[ n ] = IllegalTypeException(Property value has wrong
type!,
static_cast cppu::OWeakObject * ( this ) );
}
}
else
{
-aRet[ n ] = Exception(
-::rtl::OUString(
-RTL_CONSTASCII_USTRINGPARAM(No property
set for storing the value!)
-),
+aRet[ n ] = Exception(No property set for storing the value!,
static_cast cppu::OWeakObject * ( this ) );
}
}
@@ -478,28 +459,24 @@
{
// Append all Core Properties.
xRow-appendString (
-Property(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ContentType)),
- -1,
+Property( ContentType, -1,
getCppuType( static_cast const rtl::OUString * ( 0 ) ),
PropertyAttribute::BOUND
| PropertyAttribute::READONLY ),
getContentType() );
xRow-appendString (
-
[PATCH] Remove some unneeded variables in filter
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1773
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/73/1773/1
Remove some unneeded variables in filter
Change-Id: Ia2963498a197a795155a42b2588f983019d89f35
---
M filter/source/graphicfilter/eps/eps.cxx
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/filter/source/graphicfilter/eps/eps.cxx
b/filter/source/graphicfilter/eps/eps.cxx
index 9405328..58c56f5 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -298,26 +298,21 @@
if( pResMgr )
{
-String aPreviewStr( Preview );
-String aVersionStr( Version );
-String aColorStr( ColorFormat );
-String aComprStr( CompressionMode );
#ifdef UNX // don't put binary tiff preview ahead of postscript code by
default on unix as ghostscript is unable to read it
-mnPreview = pFilterConfigItem-ReadInt32( aPreviewStr, 0 );
+mnPreview = pFilterConfigItem-ReadInt32( Preview, 0 );
#else
-mnPreview = pFilterConfigItem-ReadInt32( aPreviewStr, 1 );
+mnPreview = pFilterConfigItem-ReadInt32( Preview, 1 );
#endif
-mnLevel = pFilterConfigItem-ReadInt32( aVersionStr, 2 );
+mnLevel = pFilterConfigItem-ReadInt32( Version, 2 );
if ( mnLevel != 1 )
mnLevel = 2;
-mbGrayScale = pFilterConfigItem-ReadInt32( aColorStr, 1 ) == 2;
+mbGrayScale = pFilterConfigItem-ReadInt32( ColorFormat, 1 ) ==
2;
#ifdef UNX // don't compress by default on unix as ghostscript is unable to
read LZW compressed eps
-mbCompression = pFilterConfigItem-ReadInt32( aComprStr, 0 ) != 0;
+mbCompression = pFilterConfigItem-ReadInt32( CompressionMode, 0
) != 0;
#else
-mbCompression = pFilterConfigItem-ReadInt32( aComprStr, 1 ) == 1;
+mbCompression = pFilterConfigItem-ReadInt32( CompressionMode, 1
) == 1;
#endif
-String sTextMode( TextMode );
-mnTextMode = pFilterConfigItem-ReadInt32( sTextMode, 0 );
+mnTextMode = pFilterConfigItem-ReadInt32( TextMode, 0 );
if ( mnTextMode 2 )
mnTextMode = 0;
delete pResMgr;
--
To view, visit https://gerrit.libreoffice.org/1773
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2963498a197a795155a42b2588f983019d89f35
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza marcos.souza@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#57950: Remove chained appends in filter
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1687
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/87/1687/1
fdo#57950: Remove chained appends in filter
Also removed a lot of *STRINGPARAM macros.
Change-Id: I46856d33bb28e37ab115860095644c7e95cf3c4e
---
M filter/source/msfilter/msdffimp.cxx
1 file changed, 127 insertions(+), 139 deletions(-)
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index f36d504..8fa491a 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -251,7 +251,7 @@
rtl::OUString aURLStr;
-if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(d:\\ashape.dbg)), aURLStr ) )
+if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL(
rtl::OUString(d:\\ashape.dbg), aURLStr ) )
{
SvStream* pOut = ::utl::UcbStreamHelper::CreateStream( aURLStr,
STREAM_WRITE );
@@ -262,19 +262,16 @@
if ( IsProperty( DFF_Prop_adjustValue ) || IsProperty(
DFF_Prop_pVertices ) )
{
pOut-WriteLine( );
-rtl::OStringBuffer
aString(RTL_CONSTASCII_STRINGPARAM(ShapeId: ));
-aString.append(static_castsal_Int32(nShapeId));
-pOut-WriteLine(aString.makeStringAndClear());
+OString aString(ShapeId: +
OString::valueOf(static_castsal_Int32(nShapeId)));
+pOut-WriteLine(aString);
}
for ( sal_uInt32 i = DFF_Prop_adjustValue; i =
DFF_Prop_adjust10Value; i++ )
{
if ( IsProperty( i ) )
{
-rtl::OStringBuffer
aString(RTL_CONSTASCII_STRINGPARAM(Prop_adjustValue));
-aString.append(static_castsal_Int32( ( i -
DFF_Prop_adjustValue ) + 1 ) );
-aString.append(':');
-
aString.append(static_castsal_Int32(GetPropertyValue(i)));
-pOut-WriteLine(aString.makeStringAndClear());
+OString aString(Prop_adjustValue +
OString::valueOf((static_castsal_Int32( ( i - DFF_Prop_adjustValue ) + 1 ) ))
+
+: +
OString::valueOf(static_castsal_Int32(GetPropertyValue(i;
+pOut-WriteLine(aString);
}
}
sal_Int32 i;
@@ -290,17 +287,13 @@
if ( nLen )
{
pOut-WriteLine( );
-rtl::OStringBuffer
aDesc(RTL_CONSTASCII_STRINGPARAM(Property:));
-aDesc.append(static_castsal_Int32(i));
-aDesc.append(RTL_CONSTASCII_STRINGPARAM(
Size:));
-aDesc.append(nLen);
+OStringBuffer aDesc(Property: +
OString::valueOf(static_castsal_Int32(i)) +
+ Size: +
OString::valueOf(nLen));
pOut-WriteLine(aDesc.makeStringAndClear());
sal_Int16 nNumElem, nNumElemMem, nNumSize;
rIn nNumElem nNumElemMem nNumSize;
-aDesc.append(RTL_CONSTASCII_STRINGPARAM(Entries:
));
-aDesc.append(static_castsal_Int32(nNumElem));
-aDesc.append(RTL_CONSTASCII_STRINGPARAM(
Size:));
-aDesc.append(static_castsal_Int32(nNumSize));
+aDesc.append(Entries: +
OString::valueOf(static_castsal_Int32(nNumElem)) +
+ Size: +
OString::valueOf(static_castsal_Int32(nNumSize)));
pOut-WriteLine(aDesc.makeStringAndClear());
if ( nNumSize 0 )
nNumSize = ( ( -nNumSize ) 2 );
@@ -338,11 +331,9 @@
}
else
{
-rtl::OStringBuffer
aString(RTL_CONSTASCII_STRINGPARAM(Property));
-aString.append(static_castsal_Int32(i));
-aString.append(':');
-
aString.append(static_castsal_Int32(GetPropertyValue(i)));
-pOut-WriteLine(aString.makeStringAndClear());
+OString aString(Property +
OString::valueOf(static_castsal_Int32(i)) +
+: +
OString::valueOf(static_castsal_Int32(GetPropertyValue(i;
+pOut-WriteLine(aString);
}
}
}
@@ -578,15 +569,15 @@
case OBJ_CUSTOMSHAPE :
{
SdrCustomShapeGeometryItem aGeometryItem(
[PATCH] fdo#57950: dbaccess: STRINGPARAM and more chained appends
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1706
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/06/1706/1
fdo#57950: dbaccess: STRINGPARAM and more chained appends
Change-Id: Iab1ba5eb6702d386e2775d7426c3398b606d2d97
---
M dbaccess/source/core/api/CacheSet.cxx
M dbaccess/source/core/api/OptimisticSet.cxx
M dbaccess/source/core/api/View.cxx
M dbaccess/source/core/api/query.cxx
M dbaccess/source/core/api/querycomposer.cxx
M dbaccess/source/core/api/querycontainer.cxx
M dbaccess/source/core/dataaccess/ComponentDefinition.cxx
M dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
M dbaccess/source/filter/xml/xmlServerDatabase.cxx
M dbaccess/source/ui/uno/composerdialogs.cxx
M dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
11 files changed, 72 insertions(+), 123 deletions(-)
diff --git a/dbaccess/source/core/api/CacheSet.cxx
b/dbaccess/source/core/api/CacheSet.cxx
index 8b8e924..5974d4a 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -156,14 +156,12 @@
void SAL_CALL OCacheSet::insertRow( const ORowSetRow _rInsertRow,const
connectivity::OSQLTable _xTable ) throw(SQLException, RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, dbaccess, ocke.jans...@sun.com,
OCacheSet::insertRow );
-::rtl::OUStringBuffer aSql(::rtl::OUString(INSERT INTO ));
+OUStringBuffer aSql(INSERT INTO + m_aComposedTableName + ( );
ReferenceXPropertySet xSet(_xTable,UNO_QUERY);
fillTableName(xSet);
-aSql.append(m_aComposedTableName);
-aSql.append(::rtl::OUString( ( ));
// set values and column names
-::rtl::OUStringBuffer aValues = ::rtl::OUString( VALUES ( );
+::rtl::OUStringBuffer aValues( VALUES ( );
static ::rtl::OUString aPara(?,);
::rtl::OUString aQuote = getIdentifierQuoteString();
static ::rtl::OUString aComma(,);
@@ -172,8 +170,7 @@
connectivity::ORowVector ORowSetValue ::Vector::iterator aEnd =
_rInsertRow-get().end();
for(; aIter != aEnd;++aIter)
{
-aSql.append(::dbtools::quoteName(
aQuote,m_xSetMetaData-getColumnName(i++)));
-aSql.append(aComma);
+aSql.append(::dbtools::quoteName(
aQuote,m_xSetMetaData-getColumnName(i++)) + aComma);
aValues.append(aPara);
}
@@ -280,8 +277,7 @@
}
if(aIter-isModified())
{
-_sParameter.append(::dbtools::quoteName( aQuote,aColumnName));
-_sParameter.append(aPara);
+_sParameter.append(::dbtools::quoteName( aQuote,aColumnName) +
aPara);
}
}
}
@@ -292,9 +288,7 @@
ReferenceXPropertySet xSet(_xTable,UNO_QUERY);
fillTableName(xSet);
-::rtl::OUStringBuffer aSql = ::rtl::OUString(UPDATE );
-aSql.append(m_aComposedTableName);
-aSql.append(::rtl::OUString( SET ));
+OUStringBuffer aSql(UPDATE + m_aComposedTableName + SET );
// list all cloumns that should be set
::rtl::OUStringBuffer aCondition;
@@ -305,8 +299,7 @@
{
aCondition.setLength(aCondition.getLength()-5);
-aSql.append(::rtl::OUString( WHERE ));
-aSql.append(aCondition.makeStringAndClear());
+aSql.append( WHERE + aCondition.makeStringAndClear());
}
else
::dbtools::throwSQLException(
@@ -340,9 +333,7 @@
ReferenceXPropertySet xSet(_xTable,UNO_QUERY);
fillTableName(xSet);
-::rtl::OUStringBuffer aSql = ::rtl::OUString(DELETE FROM );
-aSql.append(m_aComposedTableName);
-aSql.append(::rtl::OUString( WHERE ));
+OUStringBuffer aSql(DELETE FROM + m_aComposedTableName + WHERE );
// list all cloumns that should be set
::rtl::OUString aQuote = getIdentifierQuoteString();
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx
b/dbaccess/source/core/api/OptimisticSet.cxx
index ca6f1b5..e68cc7e 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -74,12 +74,12 @@
{
::rtl::OUStringBuffer rKeyCondition = io_aKeyConditions[i_sTableName];
if ( rKeyCondition.getLength() )
-rKeyCondition.appendAscii( AND );
+rKeyCondition.append( AND );
rKeyCondition.append(i_sQuotedColumnName);
if ( i_aValue.isNull() )
-rKeyCondition.appendAscii( IS NULL);
+rKeyCondition.append( IS NULL);
else
-rKeyCondition.appendAscii( = ?);
+rKeyCondition.append( = ?);
}
}
@@ -214,9 +214,8 @@
}
::rtl::OUStringBuffer rPart = aSql[aIter-second.sTableName];
if ( rPart.getLength() )
-rPart.appendAscii(, );
-rPart.append(sQuotedColumnName);
-rPart.append(s_sPara);
+rPart.append(, );
+rPart.append(sQuotedColumnName + s_sPara);
}
}
@@ -238,18 +237,14 @@
if ( aSqlIter-second.getLength() )
{
[PATCH] Sanitize/simplify some parameters of functions in dbaccess
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1707
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/07/1707/1
Sanitize/simplify some parameters of functions in dbaccess
Some functions have parameters of OUString, so, we don't need this type of junk:
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( LayoutManager )
and we can use directly:
LayoutManager
I believe this brings some simplification to the code, at first glance!
Also in this patch, changed some equalsAsciiL to ==, this simplifies more code
yet.
Change-Id: I38b8076afb84d77ed51c7be407c7f899d80829ff
---
M dbaccess/source/core/dataaccess/documentdefinition.cxx
1 file changed, 25 insertions(+), 27 deletions(-)
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx
b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 120ffdb..e6cff05 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -401,8 +401,7 @@
::rtl::OUString aEntryDocName;
if (( xObjConfig-getByName( aClassIDs[nInd] ) =
xObjectProps ) xObjectProps.is()
- (
xObjectProps-getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ObjectDocumentServiceName))
- ) = aEntryDocName )
+ (
xObjectProps-getByName(ObjectDocumentServiceName) = aEntryDocName )
aEntryDocName.equals( sResult ) )
{
_rClassId =
aConfigHelper.GetSequenceClassIDRepresentation(aClassIDs[nInd]);
@@ -713,7 +712,7 @@
{
Reference XPropertySet xPropSet( xFrame, UNO_QUERY_THROW );
m_xLayoutManager.set(
-xPropSet-getPropertyValue( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( LayoutManager ) ) ),
+xPropSet-getPropertyValue( LayoutManager ),
UNO_QUERY_THROW );
m_xLayoutManager-lock();
@@ -759,14 +758,14 @@
LayoutManagerLock aLockLayout( _rxController );
// setting of the visual properties
-
xViewSettings-setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ShowRulers)),makeAny(sal_True));
-
xViewSettings-setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ShowVertRuler)),makeAny(sal_True));
-
xViewSettings-setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ShowHoriRuler)),makeAny(sal_True));
-
xViewSettings-setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(IsRasterVisible)),makeAny(sal_True));
-
xViewSettings-setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(IsSnapToRaster)),makeAny(sal_True));
-
xViewSettings-setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ShowOnlineLayout)),makeAny(sal_True));
-
xViewSettings-setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(RasterSubdivisionX)),makeAny(sal_Int32(5)));
-
xViewSettings-setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(RasterSubdivisionY)),makeAny(sal_Int32(5)));
+xViewSettings-setPropertyValue(ShowRulers,makeAny(sal_True));
+xViewSettings-setPropertyValue(ShowVertRuler,makeAny(sal_True));
+xViewSettings-setPropertyValue(ShowHoriRuler,makeAny(sal_True));
+xViewSettings-setPropertyValue(IsRasterVisible,makeAny(sal_True));
+xViewSettings-setPropertyValue(IsSnapToRaster,makeAny(sal_True));
+xViewSettings-setPropertyValue(ShowOnlineLayout,makeAny(sal_True));
+
xViewSettings-setPropertyValue(RasterSubdivisionX,makeAny(sal_Int32(5)));
+
xViewSettings-setPropertyValue(RasterSubdivisionY,makeAny(sal_Int32(5)));
}
catch( const Exception )
{
@@ -950,9 +949,9 @@
if ( xModule.is() )
{
if ( m_bForm )
-xModule-setIdentifier( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( com.sun.star.sdb.FormDesign ) ) );
+xModule-setIdentifier( com.sun.star.sdb.FormDesign );
else if ( !xReportDefinition.is() )
-xModule-setIdentifier( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( com.sun.star.sdb.TextReportDesign ) ) );
+xModule-setIdentifier( com.sun.star.sdb.TextReportDesign );
updateDocumentTitle();
}
@@ -993,9 +992,9 @@
{
Any aRet;
-sal_Bool bOpen = aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
open ) );
-sal_Bool bOpenInDesign = aCommand.Name.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( openDesign ) );
-sal_Bool bOpenForMail = aCommand.Name.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( openForMail ) );
+sal_Bool bOpen = aCommand.Name == open;
+sal_Bool bOpenInDesign = aCommand.Name == openDesign;
+sal_Bool bOpenForMail = aCommand.Name == openForMail;
if ( bOpen || bOpenInDesign || bOpenForMail )
{
[PATCH] fdo#57950: Remove some chained appends in shell
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1682
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/82/1682/1
fdo#57950: Remove some chained appends in shell
And remove some *STRINGPARAM macros.
Change-Id: Idebee475e4b383f5f390040515bdfa7c49a24c1d
---
M shell/source/backends/gconfbe/gconfaccess.cxx
M shell/source/backends/localebe/localebackend.cxx
M shell/source/cmdmail/cmdmailentry.cxx
M shell/source/cmdmail/cmdmailsuppl.cxx
M shell/source/unix/exec/shellexec.cxx
M shell/source/unix/exec/shellexecentry.cxx
M shell/source/unix/sysshell/recently_used_file_handler.cxx
7 files changed, 57 insertions(+), 84 deletions(-)
diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx
b/shell/source/backends/gconfbe/gconfaccess.cxx
index 205a2cf..4705013 100644
--- a/shell/source/backends/gconfbe/gconfaccess.cxx
+++ b/shell/source/backends/gconfbe/gconfaccess.cxx
@@ -57,13 +57,12 @@
GError* aError = NULL;
if (!gconf_init(0, NULL, aError))
{
-rtl::OUStringBuffer msg;
-msg.appendAscii(GconfBackend:GconfLayer: Cannot Initialize Gconf
connection - );
-msg.appendAscii(aError-message);
+OUString msg(GconfBackend:GconfLayer: Cannot Initialize Gconf
connection - +
+ OUString::createFromAscii(aError-message));
g_error_free(aError);
aError = NULL;
-throw uno::RuntimeException(msg.makeStringAndClear(),NULL);
+throw uno::RuntimeException(msg, NULL);
}
mClient = gconf_client_get_default();
@@ -116,13 +115,11 @@
config_home = getenv (XDG_CONFIG_HOME);
if (config_home == NULL || config_home[0] == 0)
{
-aConfigFileURL = OUString(aHomeDirURL);
-aConfigFileURL += OUString(/.config/user-dirs.dirs);
+aConfigFileURL = aHomeDirURL + /.config/user-dirs.dirs;
}
else
{
-aConfigFileURL = OUString::createFromAscii(config_home);
-aConfigFileURL += OUString(/user-dirs.dirs);
+aConfigFileURL = OUString::createFromAscii(config_home) +
/user-dirs.dirs;
}
if(osl_File_E_None == osl_openFile(aConfigFileURL.pData, handle,
osl_File_OpenFlag_Read))
@@ -167,8 +164,7 @@
continue;
if (relative)
{
-aUserDirBuf = OUStringBuffer(aHomeDirURL);
-aUserDirBuf.appendAscii( RTL_CONSTASCII_STRINGPARAM( / ) );
+aUserDirBuf = OUStringBuffer(aHomeDirURL + /);
}
else
{
@@ -195,15 +191,11 @@
/* Special case desktop for historical compatibility */
if (strcmp (type, DESKTOP) == 0)
{
-aUserDirBuf = OUStringBuffer(aHomeDirURL);
-aUserDirBuf.appendAscii( RTL_CONSTASCII_STRINGPARAM( /Desktop ) );
-return aUserDirBuf.makeStringAndClear();
+return aHomeDirURL + /Desktop;
}
else
{
-aUserDirBuf = OUStringBuffer(aHomeDirURL);
-aUserDirBuf.appendAscii( RTL_CONSTASCII_STRINGPARAM( /Documents ) );
-return aUserDirBuf.makeStringAndClear();
+return aHomeDirURL + /Documents;
}
}
@@ -277,8 +269,7 @@
GSList * list = gconf_value_get_list(pGconfValue);
for(; list; list = g_slist_next(list))
{
-aBuffer.append(gconf_value_get_string((GConfValue *)
list-data));
-aBuffer.append(;);
+aBuffer.append(gconf_value_get_string((GConfValue *)
list-data) + OString(;));
}
// Remove trailing ;
aBuffer.setLength(aBuffer.getLength()-1);
diff --git a/shell/source/backends/localebe/localebackend.cxx
b/shell/source/backends/localebe/localebackend.cxx
index 544cb42..5e38f3a 100644
--- a/shell/source/backends/localebe/localebackend.cxx
+++ b/shell/source/backends/localebe/localebackend.cxx
@@ -289,14 +289,12 @@
return css::uno::makeAny(
css::beans::Optional css::uno::Any (
true, css::uno::makeAny(getLocale(;
-} else if (PropertyName.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM(SystemLocale)))
+} else if (PropertyName.equals(SystemLocale))
{
return css::uno::makeAny(
css::beans::Optional css::uno::Any (
true, css::uno::makeAny(getSystemLocale(;
-} else if (PropertyName.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM(UILocale)))
+} else if (PropertyName.equals(UILocale))
{
return css::uno::makeAny(
css::beans::Optional css::uno::Any (
diff --git a/shell/source/cmdmail/cmdmailentry.cxx
b/shell/source/cmdmail/cmdmailentry.cxx
index a0de1f3..4448d1d 100644
--- a/shell/source/cmdmail/cmdmailentry.cxx
+++ b/shell/source/cmdmail/cmdmailentry.cxx
@@ -62,11 +62,11 @@
if (0 == ::rtl_str_compare( pImplName, COMP_IMPL_NAME ))
fdo#57950: Remove chained appends in dbaccess
Marcos Souza has abandoned this change. Change subject: fdo#57950: Remove chained appends in dbaccess .. Patch Set 1: Abandoned I will send this again rebased, and aiehtout any oatch that depends on this. -- To view, visit https://gerrit.libreoffice.org/1604 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: If9a1090b1c8daea03c3e39f8cfd2f395dd1c337b Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
fdo#57950: More chained appends in dbaccess
Marcos Souza has abandoned this change. Change subject: fdo#57950: More chained appends in dbaccess .. Patch Set 4: Abandoned Will send again. -- To view, visit https://gerrit.libreoffice.org/1564 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I5a68ea61b284eb63c22d376c45e1f3788b1b4b50 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz Gerrit-Reviewer: Marcos Souza marcos.souza@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#57950: Remove chained appends in dbaccess
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1604
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/04/1604/1
fdo#57950: Remove chained appends in dbaccess
Also remove some rtl:: prefixes.
Change-Id: If9a1090b1c8daea03c3e39f8cfd2f395dd1c337b
Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com
---
M dbaccess/source/ui/misc/WCopyTable.cxx
M dbaccess/source/ui/querydesign/QueryDesignView.cxx
2 files changed, 32 insertions(+), 48 deletions(-)
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx
b/dbaccess/source/ui/misc/WCopyTable.cxx
index 5edb86e..2521c74 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -235,37 +235,35 @@
return new OFieldDescription( xColumn );
}
//
-::rtl::OUString ObjectCopySource::getSelectStatement() const
+OUString ObjectCopySource::getSelectStatement() const
{
-::rtl::OUString sSelectStatement;
+OUString sSelectStatement;
if ( m_xObjectPSI-hasPropertyByName( PROPERTY_COMMAND ) )
{ // query
OSL_VERIFY( m_xObject-getPropertyValue( PROPERTY_COMMAND ) =
sSelectStatement );
}
else
{ // table
-::rtl::OUStringBuffer aSQL;
-aSQL.appendAscii( SELECT );
+OUStringBuffer aSQL( SELECT );
// we need to create the sql stmt with column names
// otherwise it is possible that names don't match
-const ::rtl::OUString sQuote = m_xMetaData-getIdentifierQuoteString();
+const OUString sQuote = m_xMetaData-getIdentifierQuoteString();
-Sequence ::rtl::OUString aColumnNames = getColumnNames();
-const ::rtl::OUString* pColumnName = aColumnNames.getConstArray();
-const ::rtl::OUString* pEnd = pColumnName + aColumnNames.getLength();
+Sequence OUString aColumnNames = getColumnNames();
+const OUString* pColumnName = aColumnNames.getConstArray();
+const OUString* pEnd = pColumnName + aColumnNames.getLength();
for ( ; pColumnName != pEnd; )
{
aSQL.append( ::dbtools::quoteName( sQuote, *pColumnName++ ) );
if ( pColumnName == pEnd )
-aSQL.appendAscii( );
+aSQL.append( );
else
-aSQL.appendAscii( , );
+aSQL.append( , );
}
-aSQL.appendAscii( FROM );
-aSQL.append( ::dbtools::composeTableNameForSelect( m_xConnection,
m_xObject ) );
+aSQL.append( FROM + ::dbtools::composeTableNameForSelect(
m_xConnection, m_xObject ) );
sSelectStatement = aSQL.makeStringAndClear();
}
@@ -418,14 +416,10 @@
return NULL;
}
//
-::rtl::OUString NamedTableCopySource::getSelectStatement() const
+OUString NamedTableCopySource::getSelectStatement() const
{
-::rtl::OUStringBuffer aSQL;
-aSQL.appendAscii( SELECT * FROM );
-
-aSQL.append( ::dbtools::composeTableNameForSelect( m_xConnection,
m_sTableCatalog, m_sTableSchema, m_sTableBareName ) );
-
-return aSQL.makeStringAndClear();
+return OUString( SELECT * FROM +
+ ::dbtools::composeTableNameForSelect( m_xConnection,
m_sTableCatalog, m_sTableSchema, m_sTableBareName ) );
}
//
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 9ef92b9..c1c6ba7 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -289,11 +289,11 @@
return eErrorCode;
}
//--
-::rtl::OUString BuildJoinCriteria( const Reference XConnection
_xConnection,
-const OConnectionLineDataVec*
pLineDataList,
-const OQueryTableConnectionData* pData)
+OUString BuildJoinCriteria( const Reference XConnection _xConnection,
+ const OConnectionLineDataVec* pLineDataList,
+ const OQueryTableConnectionData* pData)
{
-::rtl::OUStringBuffer aCondition;
+OUStringBuffer aCondition;
if ( _xConnection.is() )
{
OConnectionLineDataVec::const_iterator aIter =
pLineDataList-begin();
@@ -301,19 +301,19 @@
try
{
const Reference XDatabaseMetaData xMetaData =
_xConnection-getMetaData();
-const ::rtl::OUString aQuote =
xMetaData-getIdentifierQuoteString();
-const ::rtl::OUString sEqual(RTL_CONSTASCII_USTRINGPARAM( =
));
+const OUString aQuote = xMetaData-getIdentifierQuoteString();
+
[PATCH] fdo#57950: Remove some chained appends in dbaccess
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1559
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/59/1559/1
fdo#57950: Remove some chained appends in dbaccess
Also simplify logic a little bit.
Change-Id: I342f8d1d22e70023d23c6c8ca3976d501e18fb90
Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com
---
M dbaccess/source/core/api/SingleSelectQueryComposer.cxx
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 6f1c57f..cb92644 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -775,25 +775,17 @@
bCase = m_xMetaData-supportsMixedCaseQuotedIdentifiers();
aSelectColumns = m_aSqlIterator.getSelectColumns();
-::rtl::OUStringBuffer aSQL;
-aSQL.append( m_aPureSelectSQL );
-aSQL.append( STR_WHERE );
+OUStringBuffer aSQL( m_aPureSelectSQL + STR_WHERE + ( 0 = 1 ));
// preserve the original WHERE clause
// #i102234#
-::rtl::OUString sOriginalWhereClause = getSQLPart( Where,
m_aSqlIterator, sal_False );
+OUString sOriginalWhereClause = getSQLPart( Where, m_aSqlIterator,
sal_False );
if ( !sOriginalWhereClause.isEmpty() )
{
-aSQL.appendAscii( ( 0 = 1 ) AND ( );
-aSQL.append( sOriginalWhereClause );
-aSQL.appendAscii( ) );
-}
-else
-{
-aSQL.appendAscii( ( 0 = 1 ) );
+aSQL.append( AND ( + sOriginalWhereClause + ) );
}
-::rtl::OUString sGroupBy = getSQLPart( Group, m_aSqlIterator, sal_True
);
+OUString sGroupBy = getSQLPart( Group, m_aSqlIterator, sal_True );
if ( !sGroupBy.isEmpty() )
aSQL.append( sGroupBy );
--
To view, visit https://gerrit.libreoffice.org/1559
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I342f8d1d22e70023d23c6c8ca3976d501e18fb90
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza marcos.souza@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#57950: More fixes for chained appends in dbaccess
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1561
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/61/1561/1
fdo#57950: More fixes for chained appends in dbaccess
And also:
Remove some RTL_* macros
Remove ::rtl prefix
Change-Id: I9c3902672518559e8a139c37bc1933843bebfe5d
Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com
---
M dbaccess/source/core/api/SingleSelectQueryComposer.cxx
1 file changed, 144 insertions(+), 165 deletions(-)
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index cb92644..f398a46 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -80,18 +80,18 @@
namespace BooleanComparisonMode = ::com::sun::star::sdb::BooleanComparisonMode;
}
-#define STR_SELECT ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SELECT ))
-#define STR_FROM::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( FROM ))
-#define STR_WHERE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( WHERE ))
-#define STR_GROUP_BY::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( GROUP BY
))
-#define STR_HAVING ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( HAVING
))
-#define STR_ORDER_BY::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ORDER BY
))
-#define STR_AND ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( AND ))
-#define STR_OR ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( OR ))
-#define STR_LIKE::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( LIKE ))
-#define L_BRACKET ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(())
-#define R_BRACKET ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM()))
-#define COMMA ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(,))
+#define STR_SELECT SELECT
+#define STR_FROM FROM
+#define STR_WHEREWHERE
+#define STR_GROUP_BY GROUP BY
+#define STR_HAVING HAVING
+#define STR_ORDER_BY ORDER BY
+#define STR_AND AND
+#define STR_OR OR
+#define STR_LIKEOUString( LIKE )
+#define L_BRACKET (
+#define R_BRACKET )
+#define COMMA ,
namespace
{
@@ -100,14 +100,14 @@
If the statement cannot be parsed, an error is thrown.
*/
-const OSQLParseNode* parseStatement_throwError( OSQLParser _rParser,
const ::rtl::OUString _rStatement, const Reference XInterface _rxContext )
+const OSQLParseNode* parseStatement_throwError( OSQLParser _rParser,
const OUString _rStatement, const Reference XInterface _rxContext )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, dbaccess,
frank.schoenh...@sun.com,
SingleSelectQueryComposer.cxx::parseStatement_throwError );
-::rtl::OUString aErrorMsg;
+OUString aErrorMsg;
const OSQLParseNode* pNewSqlParseNode = _rParser.parseTree( aErrorMsg,
_rStatement );
if ( !pNewSqlParseNode )
{
-::rtl::OUString sSQLStateGeneralError( getStandardSQLState(
SQL_GENERAL_ERROR ) );
+OUString sSQLStateGeneralError( getStandardSQLState(
SQL_GENERAL_ERROR ) );
SQLException aError2( aErrorMsg, _rxContext,
sSQLStateGeneralError, 1000, Any() );
SQLException aError1( _rStatement, _rxContext,
sSQLStateGeneralError, 1000, makeAny( aError2 ) );
throw
SQLException(_rParser.getContext().getErrorMessage(OParseContext::ERROR_GENERAL),_rxContext,sSQLStateGeneralError,1000,makeAny(aError1));
@@ -120,7 +120,7 @@
an error if not
*/
void checkForSingleSelect_throwError( const OSQLParseNode* pStatementNode,
OSQLParseTreeIterator _rIterator,
-const Reference XInterface _rxContext, const ::rtl::OUString
_rOriginatingCommand )
+const Reference XInterface _rxContext, const OUString
_rOriginatingCommand )
{
const OSQLParseNode* pOldNode = _rIterator.getParseTree();
@@ -146,7 +146,7 @@
// .
/** combines parseStatement_throwError and checkForSingleSelect_throwError
*/
-void parseAndCheck_throwError( OSQLParser _rParser, const
::rtl::OUString _rStatement,
+void parseAndCheck_throwError( OSQLParser _rParser, const OUString
_rStatement,
OSQLParseTreeIterator _rIterator, const Reference XInterface
_rxContext )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, dbaccess,
frank.schoenh...@sun.com,
SingleSelectQueryComposer.cxx::parseAndCheck_throwError );
@@ -158,9 +158,9 @@
/** transforms a parse node describing a complete statement into a pure
select
statement, without any filter/order/groupby/having clauses
*/
-::rtl::OUString getPureSelectStatement( const OSQLParseNode* _pRootNode,
Reference XConnection _rxConnection )
+OUString getPureSelectStatement( const OSQLParseNode* _pRootNode,
Reference XConnection
[PATCH] fdo#57950: More chained appends in dbaccess
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1564
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/64/1564/1
fdo#57950: More chained appends in dbaccess
And more:
Remove RTL_* macros
Remove ::rtl prefix
Change-Id: I5a68ea61b284eb63c22d376c45e1f3788b1b4b50
Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com
---
M dbaccess/source/core/api/OptimisticSet.cxx
M dbaccess/source/core/dataaccess/documentcontainer.cxx
M dbaccess/source/core/dataaccess/documentdefinition.cxx
M dbaccess/source/core/inc/composertools.hxx
M dbaccess/source/core/misc/sdbcoretools.cxx
5 files changed, 92 insertions(+), 139 deletions(-)
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx
b/dbaccess/source/core/api/OptimisticSet.cxx
index ca6f1b5..a19df84 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -67,19 +67,19 @@
using namespace ::cppu;
using namespace ::osl;
-DECLARE_STL_USTRINGACCESS_MAP(::rtl::OUStringBuffer,TSQLStatements);
+DECLARE_STL_USTRINGACCESS_MAP(OUStringBuffer,TSQLStatements);
namespace
{
-void lcl_fillKeyCondition(const ::rtl::OUString i_sTableName,const
::rtl::OUString i_sQuotedColumnName,const ORowSetValue
i_aValue,TSQLStatements io_aKeyConditions)
+void lcl_fillKeyCondition(const OUString i_sTableName,const OUString
i_sQuotedColumnName,const ORowSetValue i_aValue,TSQLStatements
io_aKeyConditions)
{
-::rtl::OUStringBuffer rKeyCondition = io_aKeyConditions[i_sTableName];
+OUStringBuffer rKeyCondition = io_aKeyConditions[i_sTableName];
if ( rKeyCondition.getLength() )
-rKeyCondition.appendAscii( AND );
+rKeyCondition.append( AND );
rKeyCondition.append(i_sQuotedColumnName);
if ( i_aValue.isNull() )
-rKeyCondition.appendAscii( IS NULL);
+rKeyCondition.append( IS NULL);
else
-rKeyCondition.appendAscii( = ?);
+rKeyCondition.append( = ?);
}
}
@@ -91,7 +91,7 @@
const ORowSetValueVector
_aParameterValueForCache,
sal_Int32 i_nMaxRows,
sal_Int32 o_nRowCount)
-
:OKeySet(NULL,NULL,::rtl::OUString(),_xComposer,_aParameterValueForCache,i_nMaxRows,o_nRowCount)
+
:OKeySet(NULL,NULL,OUString(),_xComposer,_aParameterValueForCache,i_nMaxRows,o_nRowCount)
,m_aSqlParser( _rContext.getUNOContext() )
,m_aSqlIterator( i_xConnection,
ReferenceXTablesSupplier(_xComposer,UNO_QUERY)-getTables(), m_aSqlParser,
NULL )
,m_bResultSetChanged(false)
@@ -105,7 +105,7 @@
DBG_DTOR(OptimisticSet,NULL);
}
-void OptimisticSet::construct(const Reference XResultSet _xDriverSet,const
::rtl::OUString i_sRowSetFilter)
+void OptimisticSet::construct(const Reference XResultSet _xDriverSet,const
OUString i_sRowSetFilter)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, dbaccess, ocke.jans...@sun.com,
OptimisticSet::construct );
OCacheSet::construct(_xDriverSet,i_sRowSetFilter);
@@ -117,9 +117,9 @@
const ReferenceXNameAccess xQueryColumns = xQueryColSup-getColumns();
const ReferenceXTablesSupplier xTabSup(m_xComposer,UNO_QUERY);
const ReferenceXNameAccess xTables = xTabSup-getTables();
-const Sequence ::rtl::OUString aTableNames = xTables-getElementNames();
-const ::rtl::OUString* pTableNameIter = aTableNames.getConstArray();
-const ::rtl::OUString* pTableNameEnd = pTableNameIter +
aTableNames.getLength();
+const Sequence OUString aTableNames = xTables-getElementNames();
+const OUString* pTableNameIter = aTableNames.getConstArray();
+const OUString* pTableNameEnd = pTableNameIter + aTableNames.getLength();
for( ; pTableNameIter != pTableNameEnd ; ++pTableNameIter)
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
@@ -135,15 +135,15 @@
m_aKeyMap.insert(OKeySetMatrix::value_type(0,keySetValue));
m_aKeyIter = m_aKeyMap.begin();
-::rtl::OUStringBuffer aFilter = createKeyFilter();
+OUStringBuffer aFilter = createKeyFilter();
Reference XSingleSelectQueryComposer
xSourceComposer(m_xComposer,UNO_QUERY);
Reference XMultiServiceFactory xFactory(m_xConnection,
UNO_QUERY_THROW);
ReferenceXSingleSelectQueryComposer
xAnalyzer(xFactory-createInstance(SERVICE_NAME_SINGLESELECTQUERYCOMPOSER),UNO_QUERY);
-::rtl::OUString sQuery = xSourceComposer-getQuery();
+OUString sQuery = xSourceComposer-getQuery();
xAnalyzer-setElementaryQuery(xSourceComposer-getElementaryQuery());
// check for joins
-::rtl::OUString aErrorMsg;
+OUString aErrorMsg;
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptrOSQLParseNode pStatementNode( m_aSqlParser.parseTree(
aErrorMsg, sQuery ) );
SAL_WNODEPRECATED_DECLARATIONS_POP
@@ -151,7 +151,7 @@
m_aSqlIterator.traverseAll();
[PATCH] fdo#57950: Remove last chained appends from avmedia
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1548
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/48/1548/1
fdo#57950: Remove last chained appends from avmedia
Change-Id: I0906bf7493828c5923f3243c6849a2eca5f37bb0
Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com
---
M avmedia/source/framework/mediaitem.cxx
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/avmedia/source/framework/mediaitem.cxx
b/avmedia/source/framework/mediaitem.cxx
index 2776809..05c29aa 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -470,11 +470,7 @@
xTransaction-commit();
}
-OUStringBuffer buf(vnd.sun.star.Package:);
-buf.append(media);
-buf.append(sal_Unicode('/'));
-buf.append(filename);
-o_rEmbeddedURL = buf.makeStringAndClear();
+o_rEmbeddedURL = vnd.sun.star.Package: + media + / + filename;
return true;
}
catch (uno::Exception const)
--
To view, visit https://gerrit.libreoffice.org/1548
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0906bf7493828c5923f3243c6849a2eca5f37bb0
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza marcos.souza@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#57950: Remove some chained appends in chart2 and more
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1549
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/49/1549/1
fdo#57950: Remove some chained appends in chart2 and more
Removed a not needed variable;
Removed some rt:: prefixes
Change-Id: I24a7a0c5adcee17eab4c9d6442b472a5992f261e
Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com
---
M chart2/source/controller/accessibility/AccessibleBase.cxx
M chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
M chart2/source/tools/DataSeriesHelper.cxx
M chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
4 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx
b/chart2/source/controller/accessibility/AccessibleBase.cxx
index 183945b..85907b0 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -583,13 +583,10 @@
i 0 ||
static_cast ChildListVectorType::size_type ( i ) =
m_aChildList.size() )
{
-OUStringBuffer aBuf;
-aBuf.appendAscii( RTL_CONSTASCII_STRINGPARAM( Index ));
-aBuf.append( i );
-aBuf.appendAscii( RTL_CONSTASCII_STRINGPARAM( is invalid for range [
0, ));
-aBuf.append( static_cast sal_Int32 ( m_aChildList.size() - 1 ) );
-aBuf.appendAscii( RTL_CONSTASCII_STRINGPARAM( ] ) );
-lang::IndexOutOfBoundsException aEx( aBuf.makeStringAndClear(),
+OUString aBuf = Index + OUString::valueOf( i ) + is invalid for
range [ 0, +
+OUString::valueOf( static_cast sal_Int32 (
m_aChildList.size() - 1 ) ) +
+ ];
+lang::IndexOutOfBoundsException aEx( aBuf,
const_cast ::cppu::OWeakObject *
(
static_cast const
::cppu::OWeakObject * ( this )));
throw aEx;
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index a567530..6096442 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -149,17 +149,17 @@
namespace
{
-rtl::OUString lcl_makeColorName( Color rColor )
+OUString lcl_makeColorName( Color rColor )
{
-rtl::OUStringBuffer aStr(SVX_RESSTR(RID_SVXFLOAT3D_FIX_R));
-aStr.append((sal_Int32)rColor.GetRed());
-aStr.append(' ');
-aStr.append(SVX_RESSTR(RID_SVXFLOAT3D_FIX_G));
-aStr.append((sal_Int32)rColor.GetGreen());
-aStr.append(' ');
-aStr.append(SVX_RESSTR(RID_SVXFLOAT3D_FIX_B));
-aStr.append((sal_Int32)rColor.GetBlue());
-return aStr.makeStringAndClear();
+OUString aStr = SVX_RESSTR(RID_SVXFLOAT3D_FIX_R) +
+OUString::valueOf((sal_Int32)rColor.GetRed()) +
+ +
+SVX_RESSTR(RID_SVXFLOAT3D_FIX_G) +
+OUString::valueOf((sal_Int32)rColor.GetGreen()) +
+ +
+SVX_RESSTR(RID_SVXFLOAT3D_FIX_B) +
+OUString::valueOf((sal_Int32)rColor.GetBlue());
+return aStr;
}
void lcl_selectColor( ColorListBox rListBox, const Color rColor )
{
diff --git a/chart2/source/tools/DataSeriesHelper.cxx
b/chart2/source/tools/DataSeriesHelper.cxx
index b5fa305..15ea915 100644
--- a/chart2/source/tools/DataSeriesHelper.cxx
+++ b/chart2/source/tools/DataSeriesHelper.cxx
@@ -273,7 +273,6 @@
Sequence OUString aSeq( xTextSeq-getTextualData());
const sal_Int32 nMax = aSeq.getLength() - 1;
-OUString aVal;
OUStringBuffer aBuf;
for( sal_Int32 i = 0; i = nMax; ++i )
diff --git a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
index 3caef43..0551cbd 100644
--- a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
@@ -123,11 +123,10 @@
const uno::Reference util::XNumberFormatter xNumFormatter,
::sal_Int32 nNumberFormatKey ) const
{
-OUStringBuffer aBuf( C2U( f(x) = ));
+OUString aBuf = f(x) = +
+getFormattedString( xNumFormatter, nNumberFormatKey,
m_fMeanValue );
-aBuf.append( getFormattedString( xNumFormatter, nNumberFormatKey,
m_fMeanValue ));
-
-return aBuf.makeStringAndClear();
+return aBuf;
}
} // namespace chart
--
To view, visit https://gerrit.libreoffice.org/1549
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I24a7a0c5adcee17eab4c9d6442b472a5992f261e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza
[PATCH] Remove some RTL_* and some rtl:: prefixes in chart2
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1550
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/50/1550/1
Remove some RTL_* and some rtl:: prefixes in chart2
Change-Id: I47889319530d8f03bd7c78e937de55cf380d2d41
Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com
---
M chart2/source/controller/accessibility/AccStatisticsObject.cxx
M chart2/source/controller/accessibility/AccessibleBase.cxx
M chart2/source/controller/accessibility/AccessibleChartElement.cxx
M chart2/source/controller/accessibility/AccessibleChartShape.cxx
M chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
M chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
M chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
M chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
M chart2/source/controller/chartapiwrapper/GridWrapper.cxx
M chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
M chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
M chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
M chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
M chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
14 files changed, 101 insertions(+), 135 deletions(-)
diff --git a/chart2/source/controller/accessibility/AccStatisticsObject.cxx
b/chart2/source/controller/accessibility/AccStatisticsObject.cxx
index b5623de..0d4a1e3 100644
--- a/chart2/source/controller/accessibility/AccStatisticsObject.cxx
+++ b/chart2/source/controller/accessibility/AccStatisticsObject.cxx
@@ -22,8 +22,6 @@
#include vcl/svapp.hxx
#include svx/svditer.hxx
-using ::rtl::OUString;
-
namespace chart
{
@@ -47,7 +45,7 @@
OUString SAL_CALL AccStatisticsObject::getImplementationName()
throw (::com::sun::star::uno::RuntimeException)
{
-return OUString( RTL_CONSTASCII_USTRINGPARAM( StatisticsObject ));
+return OUString( StatisticsObject );
}
} // namespace chart
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx
b/chart2/source/controller/accessibility/AccessibleBase.cxx
index 85907b0..8671673 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -58,8 +58,6 @@
using namespace ::com::sun::star::accessibility;
using ::com::sun::star::uno::UNO_QUERY;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
using ::com::sun::star::uno::Reference;
using ::osl::MutexGuard;
using ::osl::ClearableMutexGuard;
@@ -131,9 +129,8 @@
BroadcastAccEvent(
AccessibleEventId::VISIBLE_DATA_CHANGED, aEmpty, aEmpty );
#if OSL_DEBUG_LEVEL 1
OSL_TRACE(
-::rtl::OUStringToOString(
-OUString( RTL_CONSTASCII_USTRINGPARAM(
- Visible data event sent by: )) +
+OUStringToOString(
+OUString( Visible data event sent by: ) +
getAccessibleName(),
RTL_TEXTENCODING_ASCII_US ).getStr() );
#endif
@@ -150,9 +147,8 @@
BroadcastAccEvent( AccessibleEventId::STATE_CHANGED,
aSelected, aEmpty, true );
#if OSL_DEBUG_LEVEL 1
OSL_TRACE(
-::rtl::OUStringToOString(
-OUString( RTL_CONSTASCII_USTRINGPARAM(
- Selection acquired by: )) +
+OUStringToOString(
+OUString( Selection acquired by: ) +
getAccessibleName(),
RTL_TEXTENCODING_ASCII_US ).getStr() );
#endif
@@ -169,9 +165,8 @@
BroadcastAccEvent( AccessibleEventId::STATE_CHANGED,
aEmpty, aSelected, true );
#if OSL_DEBUG_LEVEL 1
OSL_TRACE(
-::rtl::OUStringToOString(
-OUString( RTL_CONSTASCII_USTRINGPARAM(
- Selection lost by: )) +
+OUStringToOString(
+OUString( Selection lost by: ) +
getAccessibleName(),
RTL_TEXTENCODING_ASCII_US ).getStr() );
#endif
@@ -910,7 +905,7 @@
OUString SAL_CALL AccessibleBase::getImplementationName()
throw (RuntimeException)
{
-return OUString( RTL_CONSTASCII_USTRINGPARAM( AccessibleBase ));
+return OUString( AccessibleBase );
}
sal_Bool SAL_CALL AccessibleBase::supportsService( const OUString ServiceName
)
@@ -922,10 +917,10 @@
uno::Sequence OUString SAL_CALL AccessibleBase::getSupportedServiceNames()
throw (RuntimeException)
{
-uno::Sequence ::rtl::OUString aSeq( 2 );
-::rtl::OUString* pStr = aSeq.getArray();
-pStr[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
[PATCH] fdo#57950: Remove some chained appends and more in dbaccess
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1552
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/52/1552/1
fdo#57950: Remove some chained appends and more in dbaccess
- Sanitized some OUStringBuilder, avoiding creating a new one and after
make some appends
- Removed some ::rtl prefixes
- Remove RTL_* macro
Change-Id: Ide3d78f20c68774cd4864b82cb8d29784228d1cd
Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com
---
M dbaccess/source/core/api/KeySet.cxx
1 file changed, 93 insertions(+), 118 deletions(-)
diff --git a/dbaccess/source/core/api/KeySet.cxx
b/dbaccess/source/core/api/KeySet.cxx
index 21b897b..3b7ca89 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -105,7 +105,7 @@
OKeySet::OKeySet(const connectivity::OSQLTable _xTable,
const Reference XIndexAccess _xTableKeys,
- const ::rtl::OUString _rUpdateTableName,// this can be
the alias or the full qualified name
+ const OUString _rUpdateTableName,// this can be the
alias or the full qualified name
const Reference XSingleSelectQueryAnalyzer _xComposer,
const ORowSetValueVector _aParameterValueForCache,
sal_Int32 i_nMaxRows,
@@ -149,13 +149,13 @@
SAL_WNODEPRECATED_DECLARATIONS_PUSH
void OKeySet::findTableColumnsMatching_throw( const Any i_aTable,
-const ::rtl::OUString
i_rUpdateTableName,
+const OUString
i_rUpdateTableName,
const
ReferenceXDatabaseMetaData i_xMeta,
const ReferenceXNameAccess
i_xQueryColumns,
::std::auto_ptrSelectColumnsMetaData o_pKeyColumnNames)
{
// first ask the database itself for the best columns which can be used
-Sequence ::rtl::OUString aBestColumnNames;
+Sequence OUString aBestColumnNames;
ReferenceXNameAccess xKeyColumns = getPrimaryKeyColumns_throw(i_aTable);
if ( xKeyColumns.is() )
aBestColumnNames = xKeyColumns-getElementNames();
@@ -166,14 +166,14 @@
ReferenceXParametersSupplier xParaSup(m_xComposer,UNO_QUERY);
ReferenceXIndexAccess xQueryParameters = xParaSup-getParameters();
const sal_Int32 nParaCount = xQueryParameters-getCount();
-Sequence ::rtl::OUString aParameterColumns(nParaCount);
+Sequence OUString aParameterColumns(nParaCount);
for(sal_Int32 i = 0; i nParaCount;++i)
{
ReferenceXPropertySet
xPara(xQueryParameters-getByIndex(i),UNO_QUERY_THROW);
xPara-getPropertyValue(PROPERTY_REALNAME) = aParameterColumns[i];
}
-::rtl::OUString sUpdateTableName( i_rUpdateTableName );
+OUString sUpdateTableName( i_rUpdateTableName );
if ( sUpdateTableName.isEmpty() )
{
OSL_FAIL( OKeySet::findTableColumnsMatching_throw: This is a fallback
only - it won't work when the table has an alias name. );
@@ -186,7 +186,7 @@
// by sUpdateTableName. Since the latter is table, but the columns
only know that they belong to a table
// named alias, there will be no matching - so getColumnPositions
wouldn't find anything.
-::rtl::OUString sCatalog, sSchema, sTable;
+OUString sCatalog, sSchema, sTable;
ReferenceXPropertySet xTableProp( i_aTable, UNO_QUERY_THROW );
xTableProp-getPropertyValue( PROPERTY_CATALOGNAME )= sCatalog;
xTableProp-getPropertyValue( PROPERTY_SCHEMANAME ) = sSchema;
@@ -200,7 +200,7 @@
if ( o_pKeyColumnNames-empty() )
{
-::dbtools::throwGenericSQLException( ::rtl::OUString( Could not find
any key column. ), *this );
+::dbtools::throwGenericSQLException( OUString( Could not find any key
column. ), *this );
}
for ( SelectColumnsMetaData::const_iterator keyColumn =
o_pKeyColumnNames-begin();
@@ -221,21 +221,13 @@
namespace
{
-void appendOneKeyColumnClause( const ::rtl::OUString tblName, const
::rtl::OUString colName, ::rtl::OUStringBuffer o_buf )
+void appendOneKeyColumnClause( const OUString tblName, const OUString
colName, OUStringBuffer o_buf )
{
-static ::rtl::OUString s_sDot(.);
-static ::rtl::OUString s_sParam0( ( 1 = ? AND );
-static ::rtl::OUString s_sParam1( = ? OR 1 = ? AND );
-static ::rtl::OUString s_sParam2( IS NULL ) );
-o_buf.append(s_sParam0);
-o_buf.append(tblName);
-o_buf.append(s_sDot);
-o_buf.append(colName);
-o_buf.append(s_sParam1);
-o_buf.append(tblName);
-o_buf.append(s_sDot);
-o_buf.append(colName);
-o_buf.append(s_sParam2);
+static OUString s_sDot(.);
+static OUString s_sParam0( ( 1 = ? AND );
+static OUString s_sParam1( =
[PATCH] Remove all rtl:: prefix and RTL_* from basic/qa/cppunit/test...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1512
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/12/1512/1
Remove all rtl:: prefix and RTL_* from basic/qa/cppunit/test_scanner.cxx
Change-Id: Ie9bb6018955faa41c359d18c6b2c10b58fd20db9
Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com
---
M basic/qa/cppunit/test_scanner.cxx
1 file changed, 88 insertions(+), 88 deletions(-)
diff --git a/basic/qa/cppunit/test_scanner.cxx
b/basic/qa/cppunit/test_scanner.cxx
index c813f2b..bce45c4 100644
--- a/basic/qa/cppunit/test_scanner.cxx
+++ b/basic/qa/cppunit/test_scanner.cxx
@@ -301,15 +301,15 @@
symbols = getSymbols(source7);
CPPUNIT_ASSERT(symbols.size() == 2);
-CPPUNIT_ASSERT(symbols[0].text ==
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(joxclk_)));
+CPPUNIT_ASSERT(symbols[0].text == OUString(joxclk_));
CPPUNIT_ASSERT(symbols[0].type == SbxVARIANT);
-CPPUNIT_ASSERT(source7 ==
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(joxclk ))); // Change the trailing
'_' to a ' '
+CPPUNIT_ASSERT(source7 == OUString(joxclk )); // Change the trailing '_'
to a ' '
CPPUNIT_ASSERT(symbols[1].text == cr);
CPPUNIT_ASSERT(symbols[1].type == SbxVARIANT);
symbols = getSymbols(source8);
CPPUNIT_ASSERT(symbols.size() == 2);
-CPPUNIT_ASSERT(symbols[0].text ==
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(asdf)));
+CPPUNIT_ASSERT(symbols[0].text == OUString(asdf));
CPPUNIT_ASSERT(symbols[0].type == SbxVARIANT);
CPPUNIT_ASSERT(symbols[1].text == cr);
CPPUNIT_ASSERT(symbols[1].type == SbxVARIANT);
@@ -319,7 +319,7 @@
CPPUNIT_ASSERT(symbols[0].text.isEmpty());
CPPUNIT_ASSERT(symbols[0].number = 19395);
CPPUNIT_ASSERT(symbols[0].type == SbxINTEGER);
-CPPUNIT_ASSERT(symbols[1].text ==
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(asdfa)));
+CPPUNIT_ASSERT(symbols[1].text == OUString(asdfa));
CPPUNIT_ASSERT(symbols[1].type == SbxVARIANT);
CPPUNIT_ASSERT(symbols[2].text == cr);
CPPUNIT_ASSERT(symbols[2].type == SbxVARIANT);
@@ -341,7 +341,7 @@
CPPUNIT_ASSERT(symbols[5].text.getLength() == 1);
CPPUNIT_ASSERT(symbols[5].text[0] == 'a');
CPPUNIT_ASSERT(symbols[5].type == SbxVARIANT);
-CPPUNIT_ASSERT(symbols[6].text ==
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(sdf)));
+CPPUNIT_ASSERT(symbols[6].text == OUString(sdf));
CPPUNIT_ASSERT(symbols[6].type == SbxVARIANT);
CPPUNIT_ASSERT(symbols[7].text == cr);
CPPUNIT_ASSERT(symbols[7].type == SbxVARIANT);
@@ -369,13 +369,13 @@
void ScannerTest::testComments()
{
-const rtl::OUString source1(RTL_CONSTASCII_USTRINGPARAM(REM asdf));
-const rtl::OUString source2(RTL_CONSTASCII_USTRINGPARAM(REMasdf));
-const rtl::OUString source3(RTL_CONSTASCII_USTRINGPARAM('asdf));
-const rtl::OUString source4(RTL_CONSTASCII_USTRINGPARAM(asdf _\n'100));
-const rtl::OUString source5(RTL_CONSTASCII_USTRINGPARAM('asdf _\n100));
-const rtl::OUString source6(RTL_CONSTASCII_USTRINGPARAM('asdf _\n'100));
-const rtl::OUString source7(RTL_CONSTASCII_USTRINGPARAM('asdf _\n 1234
_\n asdf'));
+const OUString source1(REM asdf);
+const OUString source2(REMasdf);
+const OUString source3('asdf);
+const OUString source4(asdf _\n'100);
+const OUString source5('asdf _\n100);
+const OUString source6('asdf _\n'100);
+const OUString source7('asdf _\n 1234 _\n asdf');
std::vectorSymbol symbols;
@@ -386,7 +386,7 @@
symbols = getSymbols(source2);
CPPUNIT_ASSERT(symbols.size() == 2);
-CPPUNIT_ASSERT(symbols[0].text ==
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(REMasdf)));
+CPPUNIT_ASSERT(symbols[0].text == OUString(REMasdf));
CPPUNIT_ASSERT(symbols[0].type == SbxVARIANT);
CPPUNIT_ASSERT(symbols[1].text == cr);
CPPUNIT_ASSERT(symbols[1].type == SbxVARIANT);
@@ -435,9 +435,9 @@
void ScannerTest::testGoto()
{
-const rtl::OUString source1(RTL_CONSTASCII_USTRINGPARAM(goto));
-const rtl::OUString source2(RTL_CONSTASCII_USTRINGPARAM(go to));
-const rtl::OUString source3(RTL_CONSTASCII_USTRINGPARAM(go\nto));
+const OUString source1(goto);
+const OUString source2(go to);
+const OUString source3(go\nto);
std::vectorSymbol symbols;
@@ -450,20 +450,20 @@
symbols = getSymbols(source2);
CPPUNIT_ASSERT(symbols.size() == 3);
-CPPUNIT_ASSERT(symbols[0].text ==
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(go)));
+CPPUNIT_ASSERT(symbols[0].text == OUString(go));
CPPUNIT_ASSERT(symbols[0].type == SbxVARIANT);
-CPPUNIT_ASSERT(symbols[1].text ==
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(to)));
+CPPUNIT_ASSERT(symbols[1].text == OUString(to));
CPPUNIT_ASSERT(symbols[1].type == SbxVARIANT);
CPPUNIT_ASSERT(symbols[2].text == cr);
CPPUNIT_ASSERT(symbols[2].type == SbxVARIANT);
symbols = getSymbols(source3);
CPPUNIT_ASSERT(symbols.size()
[PATCH] Remove all occurences of RTL_* and ::rtl prefix from basic
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1513 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/13/1513/1 Remove all occurences of RTL_* and ::rtl prefix from basic This is a big commit, so thanks for your time reviewing this :) Change-Id: Ib9bc710b87475b5695764557321e5dcef25e5933 Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com --- M basic/inc/basic/modsizeexceeded.hxx M basic/inc/basic/vbahelper.hxx M basic/source/basmgr/basicmanagerrepository.cxx M basic/source/basmgr/basmgr.cxx M basic/source/basmgr/vbahelper.cxx M basic/source/classes/errobject.cxx M basic/source/classes/eventatt.cxx M basic/source/classes/propacc.cxx M basic/source/classes/sb.cxx M basic/source/classes/sbunoobj.cxx M basic/source/comp/io.cxx M basic/source/comp/parser.cxx M basic/source/comp/sbcomp.cxx M basic/source/comp/scanner.cxx M basic/source/comp/token.cxx M basic/source/inc/dlgcont.hxx M basic/source/inc/namecont.hxx M basic/source/inc/propacc.hxx M basic/source/inc/runtime.hxx M basic/source/inc/sbunoobj.hxx M basic/source/inc/scanner.hxx M basic/source/inc/scriptcont.hxx M basic/source/inc/token.hxx M basic/source/runtime/dllmgr-x64.cxx M basic/source/runtime/dllmgr-x86.cxx M basic/source/runtime/iosys.cxx M basic/source/runtime/methods.cxx M basic/source/runtime/step1.cxx M basic/source/runtime/step2.cxx M basic/source/sbx/sbxbool.cxx M basic/source/sbx/sbxbyte.cxx M basic/source/sbx/sbxchar.cxx M basic/source/sbx/sbxconv.hxx M basic/source/sbx/sbxdbl.cxx M basic/source/sbx/sbxdec.cxx M basic/source/sbx/sbxdec.hxx M basic/source/sbx/sbxint.cxx M basic/source/sbx/sbxlng.cxx M basic/source/sbx/sbxobj.cxx M basic/source/sbx/sbxres.cxx M basic/source/sbx/sbxres.hxx M basic/source/sbx/sbxscan.cxx M basic/source/sbx/sbxsng.cxx M basic/source/sbx/sbxstr.cxx M basic/source/sbx/sbxuint.cxx M basic/source/sbx/sbxulng.cxx M basic/source/sbx/sbxvalue.cxx M basic/source/uno/dlgcont.cxx M basic/source/uno/modsizeexceeded.cxx M basic/source/uno/namecont.cxx M basic/source/uno/scriptcont.cxx 51 files changed, 530 insertions(+), 544 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1513 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib9bc710b87475b5695764557321e5dcef25e5933 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#57950: One more chained append in basic
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1516 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/16/1516/1 fdo#57950: One more chained append in basic Change-Id: I179b5bfd1d85152a53bb821ab9eeb78efb8a6083 Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com --- M basic/source/classes/sbunoobj.cxx 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 30f5c9f..e5ec362 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -954,10 +954,8 @@ } } -OUStringBuffer aSeqTypeName; -aSeqTypeName.appendAscii(aSeqLevelStr) -.append(aElementType.getTypeName()); -aRetType = Type( TypeClass_SEQUENCE, aSeqTypeName.makeStringAndClear() ); +OUString aSeqTypeName = aSeqLevelStr + aElementType.getTypeName(); +aRetType = Type( TypeClass_SEQUENCE, aSeqTypeName ); } // #i33795 Map also multi dimensional arrays to corresponding sequences else if( nDims 1 ) -- To view, visit https://gerrit.libreoffice.org/1516 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I179b5bfd1d85152a53bb821ab9eeb78efb8a6083 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#57950: Fix some chained appends in basic
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1515
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/15/1515/1
fdo#57950: Fix some chained appends in basic
Change-Id: Icac8ec992d993748a063aa95cc6f58c24fa87444
Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com
---
M basic/source/basmgr/basicmanagerrepository.cxx
M basic/source/classes/sb.cxx
M basic/source/uno/namecont.cxx
M basic/source/uno/scriptcont.cxx
4 files changed, 18 insertions(+), 25 deletions(-)
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx
b/basic/source/basmgr/basicmanagerrepository.cxx
index 2d281dc..8b86596 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -308,11 +308,9 @@
OUString aFileName( aAppBasic.getName() );
aAppBasic = INetURLObject( aAppBasicDir.getToken(1, ';') );
DBG_ASSERT(aAppBasic.GetProtocol() != INET_PROT_NOT_VALID,
-OStringBuffer(Invalid URL: \).
-append(OUStringToOString(aAppBasicDir,
-osl_getThreadTextEncoding())).
-append('').getStr()
-);
+OString(Invalid URL: \ +
+OUStringToOString(aAppBasicDir,
osl_getThreadTextEncoding()) +
+\));
aAppBasic.insertName( aFileName );
pBasicManager-SetStorageName( aAppBasic.PathToFileName() );
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 48a2c66..12cb5da 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1663,9 +1663,9 @@
}
else if( nOldID != 0 )
{
-OUStringBuffer aStdMsg;
-aStdMsg.append(Fehler
).append(static_castsal_Int32(nOldID)).append(: Kein Fehlertext
verfuegbar!);
-GetSbData()-aErrMsg = aStdMsg.makeStringAndClear();
+OUString aStdMsg = Fehler +
OUString::valueOf(static_castsal_Int32(nOldID)) +
+ : Kein Fehlertext verfuegbar!;
+GetSbData()-aErrMsg = aStdMsg;
}
else
{
@@ -1741,10 +1741,9 @@
// like vba ( adds an error number etc )
if ( SbiRuntime::isVBAEnabled() ( code == SbERR_BASIC_COMPAT ) )
{
-OUStringBuffer aTmp;
-
aTmp.append('\'').append(SbxErrObject::getUnoErrObject()-getNumber())
-.append(\'\n).append(!GetSbData()-aErrMsg.isEmpty() ?
GetSbData()-aErrMsg : rMsg);
-code = (sal_uIntPtr)*new StringErrorInfo( code,
aTmp.makeStringAndClear() );
+OUString aTmp = \' +
OUString::valueOf(SbxErrObject::getUnoErrObject()-getNumber()) +
+\'\n + OUString(!GetSbData()-aErrMsg.isEmpty()
? GetSbData()-aErrMsg : rMsg);
+code = (sal_uIntPtr)*new StringErrorInfo( code, aTmp );
}
else
{
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 92b38c6..2a61123 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -237,9 +237,7 @@
NameContainerNameMap::iterator aIt = mHashMap.find( aName );
if( aIt == mHashMap.end() )
{
-OUString sMessage = OUStringBuffer().append('')
-.append(aName).append(\ not found)
-.makeStringAndClear();
+OUString sMessage = \ + aName + \ not found;
throw NoSuchElementException(sMessage, uno::Reference uno::XInterface
());
}
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index ad58499..a7f870c 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -678,11 +678,10 @@
if( !isLibraryElementValid( pLib-getByName( aElementName ) ) )
{
#if OSL_DEBUG_LEVEL 0
-OStringBuffer aMessage;
-aMessage.append( invalid library element ' );
-aMessage.append( OUStringToOString( aElementName,
osl_getThreadTextEncoding() ) );
-aMessage.append( '. );
-OSL_FAIL( aMessage.makeStringAndClear().getStr() );
+OString aMessage = invalid library element ' +
+OUStringToOString( aElementName,
osl_getThreadTextEncoding() ) +
+'.;
+OSL_FAIL( aMessage );
#endif
continue;
}
@@ -767,11 +766,10 @@
if( !isLibraryElementValid( pLib-getByName( aElementName ) ) )
{
#if OSL_DEBUG_LEVEL 0
-OStringBuffer aMessage;
-aMessage.append( invalid library element ' );
-aMessage.append( OUStringToOString( aElementName,
osl_getThreadTextEncoding() ) );
-aMessage.append( '. );
-OSL_FAIL(
[PATCH] Remove some unused functions
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1517
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/17/1517/1
Remove some unused functions
Change-Id: I618de5d34d891b1b183cca12b71aff4128b2f92e
Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com
---
M sc/source/ui/cctrl/checklistmenu.cxx
M slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx
M slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.hxx
M unusedcode.easy
4 files changed, 0 insertions(+), 16 deletions(-)
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx
b/sc/source/ui/cctrl/checklistmenu.cxx
index b125c01..98f37d0 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -599,11 +599,6 @@
}
}
-ScDocument* ScMenuFloatingWindow::getDoc()
-{
-return mpDoc;
-}
-
void ScMenuFloatingWindow::resizeToFitMenuItems()
{
SetOutputSizePixel(getMenuSize());
diff --git a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx
b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx
index 1142f61..1df7802 100644
--- a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx
@@ -67,14 +67,6 @@
swap(maSceneObjects, rOther.maSceneObjects);
}
-void TransitionScene::clear()
-{
-maLeavingSlidePrimitives.clear();
-maEnteringSlidePrimitives.clear();
-maOverallOperations.clear();
-maSceneObjects.clear();
-}
-
OGLTransitionImpl::~OGLTransitionImpl()
{
}
diff --git a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.hxx
b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.hxx
index 3760683..9b27b47 100644
--- a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.hxx
+++ b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.hxx
@@ -95,7 +95,6 @@
TransitionScene operator=(const TransitionScene rOther);
void swap(TransitionScene rOther);
-void clear();
const Primitives_t getLeavingSlide() const
{
diff --git a/unusedcode.easy b/unusedcode.easy
index c6bdb68..8c8c30f 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -5,11 +5,9 @@
SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*,
unsigned int, unsigned char)
ScFiltersTest::testColorScaleODS()
ScFiltersTest::testColorScaleXLSX()
-ScMenuFloatingWindow::getDoc()
ScVbaFormatooo::vba::excel::XStyle::getAddIndent()
ScVbaFormatooo::vba::excel::XStyle::setAddIndent(com::sun::star::uno::Any
const)
TextEngine::GetLeftMargin() const
-TransitionScene::clear()
UnoControl::UnoControl()
VirtualDevice::SetOutputSizePixelScaleOffsetAndBuffer(Size const, Fraction
const, Point const, boost::shared_arrayunsigned char const)
Window::PostUserEvent(unsigned long, unsigned long, void*)
--
To view, visit https://gerrit.libreoffice.org/1517
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I618de5d34d891b1b183cca12b71aff4128b2f92e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza marcos.souza@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Remove last RTL_CONSTASCII_* from accessibility
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1500
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/00/1500/1
Remove last RTL_CONSTASCII_* from accessibility
Change-Id: Icb8f66c9f6ad70828aa55580a1f3aae8b2af1593
Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com
---
M accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
M accessibility/source/standard/vclxaccessiblebutton.cxx
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
index 5b66b22..096138a 100644
--- a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
+++ b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
@@ -125,10 +125,10 @@
if ( g_xUnoVirtualMachine.is() )
{
-OUString sJava(RTL_CONSTASCII_USTRINGPARAM(java));
+OUString sJava(java);
uno_getEnvironment(pJava_environment, sJava.pData,
g_xUnoVirtualMachine.get());
-OUString
sCppu_current_lb_name(RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME));
+OUString sCppu_current_lb_name(CPPU_CURRENT_LANGUAGE_BINDING_NAME);
uno_getEnvironment(pUno_environment, sCppu_current_lb_name.pData,
NULL);
if ( pJava_environment pUno_environment )
diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx
b/accessibility/source/standard/vclxaccessiblebutton.cxx
index e433811..9b6c653 100644
--- a/accessibility/source/standard/vclxaccessiblebutton.cxx
+++ b/accessibility/source/standard/vclxaccessiblebutton.cxx
@@ -139,7 +139,7 @@
OUString aName( VCLXAccessibleTextComponent::getAccessibleName() );
sal_Int32 nLength = aName.getLength();
-if ( nLength = 3 aName.matchAsciiL( RTL_CONSTASCII_STRINGPARAM(...),
nLength - 3 ) )
+if ( nLength = 3 aName.match( ..., nLength - 3 ) )
{
if ( nLength == 3 )
{
@@ -152,12 +152,12 @@
aName = aName.copy( 0, nLength - 3 );
}
}
-else if ( nLength = 3 aName.matchAsciiL(
RTL_CONSTASCII_STRINGPARAM( ), 0 ) )
+else if ( nLength = 3 aName.match( , 0 ) )
{
// remove the leading symbols
aName = aName.copy( 3, nLength - 3 );
}
-else if ( nLength = 3 aName.matchAsciiL( RTL_CONSTASCII_STRINGPARAM(
), nLength - 3 ) )
+else if ( nLength = 3 aName.match( , nLength - 3 ) )
{
// remove the trailing symbols
aName = aName.copy( 0, nLength - 3 );
--
To view, visit https://gerrit.libreoffice.org/1500
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb8f66c9f6ad70828aa55580a1f3aae8b2af1593
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza marcos.souza@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Remove last usage of RTL_CONSTASCII_STRINGPARAM in basctl
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1502
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/02/1502/1
Remove last usage of RTL_CONSTASCII_STRINGPARAM in basctl
Change-Id: I5bc79699e794de47611d785b9ae48b4badf9f2f6
Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com
---
M basctl/source/basicide/moduldl2.cxx
M basctl/source/basicide/scriptdocument.cxx
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/basctl/source/basicide/moduldl2.cxx
b/basctl/source/basicide/moduldl2.cxx
index 3245042..1fd2e47 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -288,7 +288,7 @@
// check, if Standard library
OUString aLibName = GetEntryText( pEntry, 0 );
-if ( aLibName.equalsIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM(
Standard ) ) )
+if ( aLibName.equalsIgnoreAsciiCase( Standard ) )
{
ErrorBox( this, WB_OK | WB_DEF_OK,
IDE_RESSTR(RID_STR_CANNOTCHANGENAMESTDLIB) ).Execute();
return false;
@@ -572,7 +572,7 @@
aInsertLibButton.Disable();
aDelButton.Disable();
}
-else if ( aLibName.equalsIgnoreAsciiCaseAsciiL(
RTL_CONSTASCII_STRINGPARAM( Standard ) ) )
+else if ( aLibName.equalsIgnoreAsciiCase( Standard ) )
{
aPasswordButton.Disable();
aNewLibButton.Enable();
diff --git a/basctl/source/basicide/scriptdocument.cxx
b/basctl/source/basicide/scriptdocument.cxx
index c1256b5..b184974 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -942,14 +942,14 @@
Reference XUriReference xUriRef( xUriFac-parse( aLinkURL ),
UNO_QUERY_THROW );
OUString aScheme = xUriRef-getScheme();
-if (
aScheme.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(file)) )
+if ( aScheme.equalsIgnoreAsciiCase(file) )
{
aFileURL = aLinkURL;
}
-else if (
aScheme.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(vnd.sun.star.pkg))
)
+else if ( aScheme.equalsIgnoreAsciiCase(vnd.sun.star.pkg) )
{
OUString aAuthority = xUriRef-getAuthority();
-if (
aAuthority.matchIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(vnd.sun.star.expand:))
)
+if ( aAuthority.matchIgnoreAsciiCase(vnd.sun.star.expand:) )
{
OUString aDecodedURL( aAuthority.copy( sizeof (
vnd.sun.star.expand: ) - 1 ) );
aDecodedURL = ::rtl::Uri::decode( aDecodedURL,
rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 );
--
To view, visit https://gerrit.libreoffice.org/1502
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5bc79699e794de47611d785b9ae48b4badf9f2f6
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza marcos.souza@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Remove last RTL_CONSTASCII_STRINGPARAM from animations
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1501
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/01/1501/1
Remove last RTL_CONSTASCII_STRINGPARAM from animations
Change-Id: Ib774bc7f70492910a2f3e7ac3088c4e07127b563
Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com
---
M animations/source/animcore/targetpropertiescreator.cxx
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/animations/source/animcore/targetpropertiescreator.cxx
b/animations/source/animcore/targetpropertiescreator.cxx
index 4ecdce4..9e9fd27 100644
--- a/animations/source/animcore/targetpropertiescreator.cxx
+++ b/animations/source/animcore/targetpropertiescreator.cxx
@@ -332,7 +332,7 @@
// initially. This is currently the only place
// where a shape effect influences shape
// attributes outside it's effective duration.
-if(
xAnimateNode-getAttributeName().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(visibility))
)
+if(
xAnimateNode-getAttributeName().equalsIgnoreAsciiCase(visibility) )
{
sal_Bool bVisible( sal_False );
@@ -347,13 +347,13 @@
{
// we also take the strings true and
false,
// as well as on and off here
-if(
aString.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(true)) ||
-
aString.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(on)) )
+if( aString.equalsIgnoreAsciiCase(true)
||
+aString.equalsIgnoreAsciiCase(on) )
{
bVisible = sal_True;
}
-if(
aString.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(false)) ||
-
aString.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(off)) )
+if( aString.equalsIgnoreAsciiCase(false)
||
+aString.equalsIgnoreAsciiCase(off) )
{
bVisible = sal_False;
}
@@ -468,7 +468,7 @@
sal_Bool SAL_CALL TargetPropertiesCreator::supportsService( const
OUString ServiceName ) throw( uno::RuntimeException )
{
-return
ServiceName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(SERVICE_NAME));
+return ServiceName.equalsIgnoreAsciiCase(SERVICE_NAME);
}
uno::Sequence OUString SAL_CALL
TargetPropertiesCreator::getSupportedServiceNames() throw(
uno::RuntimeException )
--
To view, visit https://gerrit.libreoffice.org/1501
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib774bc7f70492910a2f3e7ac3088c4e07127b563
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza marcos.souza@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#57950: Remove chained append and simplify strings
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1503
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/03/1503/1
fdo#57950: Remove chained append and simplify strings
No need to two strings here, since just destFolder is used.
Change-Id: Ie1bfd5744113764caaec11d9fb9c771f9c67e1c4
Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com
---
M basctl/source/basicide/moduldl2.cxx
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/basctl/source/basicide/moduldl2.cxx
b/basctl/source/basicide/moduldl2.cxx
index 1fd2e47..1c5d9311 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -1314,14 +1314,12 @@
::ucbhelper::Content sourceContent( aSourcePath, xCmdEnv,
comphelper::getProcessComponentContext() );
-OUStringBuffer buf;
-buf.appendAscii( vnd.sun.star.zip:// );
-buf.append( ::rtl::Uri::encode( aPackageURL,
-rtl_UriCharClassRegName,
-rtl_UriEncodeIgnoreEscapes,
-RTL_TEXTENCODING_UTF8 ) );
-buf.append( static_castsal_Unicode('/') );
-OUString destFolder( buf.makeStringAndClear() );
+OUString destFolder = vnd.sun.star.zip:// +
+ ::rtl::Uri::encode( aPackageURL,
+ rtl_UriCharClassRegName,
+ rtl_UriEncodeIgnoreEscapes,
+ RTL_TEXTENCODING_UTF8 ) +
+ OUString::valueOf(static_castsal_Unicode('/'));
if( xSFA-exists( aPackageURL ) )
xSFA-kill( aPackageURL );
--
To view, visit https://gerrit.libreoffice.org/1503
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie1bfd5744113764caaec11d9fb9c771f9c67e1c4
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza marcos.souza@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Remove rtl prefixes and some RTL_CONST* from basic
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1504
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/04/1504/1
Remove rtl prefixes and some RTL_CONST* from basic
Change-Id: If15d7c97de5295ea7d7f341e6b34acbfc917218d
Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com
---
M basic/qa/cppunit/test_scanner.cxx
1 file changed, 39 insertions(+), 39 deletions(-)
diff --git a/basic/qa/cppunit/test_scanner.cxx
b/basic/qa/cppunit/test_scanner.cxx
index d49b125..c813f2b 100644
--- a/basic/qa/cppunit/test_scanner.cxx
+++ b/basic/qa/cppunit/test_scanner.cxx
@@ -25,7 +25,7 @@
sal_uInt16 line;
sal_uInt16 col1;
sal_uInt16 col2;
-rtl::OUString text;
+OUString text;
double number;
SbxDataType type;
};
@@ -66,14 +66,14 @@
CPPUNIT_TEST_SUITE_END();
};
- const static rtl::OUString cr(RTL_CONSTASCII_USTRINGPARAM(\n));
- const static rtl::OUString rem(RTL_CONSTASCII_USTRINGPARAM(REM));
- const static rtl::OUString asdf(RTL_CONSTASCII_USTRINGPARAM(asdf));
- const static rtl::OUString dot(RTL_CONSTASCII_USTRINGPARAM(.));
- const static rtl::OUString goto_(RTL_CONSTASCII_USTRINGPARAM(goto));
- const static rtl::OUString excl(RTL_CONSTASCII_USTRINGPARAM(!));
+ const static OUString cr(\n);
+ const static OUString rem(REM);
+ const static OUString asdf(asdf);
+ const static OUString dot(.);
+ const static OUString goto_(goto);
+ const static OUString excl(!);
- std::vectorSymbol getSymbols(const rtl::OUString source, sal_Int32
errors, bool bCompatible = false)
+ std::vectorSymbol getSymbols(const OUString source, sal_Int32 errors,
bool bCompatible = false)
{
std::vectorSymbol symbols;
SbiScanner scanner(source);
@@ -94,7 +94,7 @@
return symbols;
}
- std::vectorSymbol getSymbols(const rtl::OUString source, bool bCompatible
= false)
+ std::vectorSymbol getSymbols(const OUString source, bool bCompatible =
false)
{
sal_Int32 i;
return getSymbols(source, i, bCompatible);
@@ -102,15 +102,15 @@
void ScannerTest::testBlankLines()
{
-const rtl::OUString source1(RTL_CONSTASCII_USTRINGPARAM());
-const rtl::OUString source2(RTL_CONSTASCII_USTRINGPARAM(\r\n));
-const rtl::OUString source3(RTL_CONSTASCII_USTRINGPARAM(\n));
-const rtl::OUString source4(RTL_CONSTASCII_USTRINGPARAM(\r));
-const rtl::OUString source5(RTL_CONSTASCII_USTRINGPARAM(\r\n\r\n));
-const rtl::OUString source6(RTL_CONSTASCII_USTRINGPARAM(\n\r));
-const rtl::OUString source7(RTL_CONSTASCII_USTRINGPARAM(\n\r\n));
-const rtl::OUString source8(RTL_CONSTASCII_USTRINGPARAM(\r\n\r));
-const rtl::OUString source9(RTL_CONSTASCII_USTRINGPARAM( ));
+const OUString source1();
+const OUString source2(\r\n);
+const OUString source3(\n);
+const OUString source4(\r);
+const OUString source5(\r\n\r\n);
+const OUString source6(\n\r);
+const OUString source7(\n\r\n);
+const OUString source8(\r\n\r);
+const OUString source9( );
std::vectorSymbol symbols;
symbols = getSymbols(source1);
@@ -167,14 +167,14 @@
void ScannerTest::testOperators()
{
-const rtl::OUString sourceE(RTL_CONSTASCII_USTRINGPARAM(=));
-const rtl::OUString sourceLT(RTL_CONSTASCII_USTRINGPARAM());
-const rtl::OUString sourceGT(RTL_CONSTASCII_USTRINGPARAM());
-const rtl::OUString sourceLTE(RTL_CONSTASCII_USTRINGPARAM(=));
-const rtl::OUString sourceGTE(RTL_CONSTASCII_USTRINGPARAM(=));
-const rtl::OUString sourceEE(RTL_CONSTASCII_USTRINGPARAM(==));
-const rtl::OUString sourceNE(RTL_CONSTASCII_USTRINGPARAM());
-const rtl::OUString sourceA(RTL_CONSTASCII_USTRINGPARAM(:=));
+const OUString sourceE(=);
+const OUString sourceLT();
+const OUString sourceGT();
+const OUString sourceLTE(=);
+const OUString sourceGTE(=);
+const OUString sourceEE(==);
+const OUString sourceNE();
+const OUString sourceA(:=);
std::vectorSymbol symbols;
@@ -239,18 +239,18 @@
void ScannerTest::testAlphanum()
{
-const rtl::OUString source1(RTL_CONSTASCII_USTRINGPARAM(asdfghefg));
-const rtl::OUString source2(RTL_CONSTASCII_USTRINGPARAM(1asfdasfd));
-const rtl::OUString
source3(RTL_CONSTASCII_USTRINGPARAM(AdfsaAUdsl10987));
-const rtl::OUString source4(RTL_CONSTASCII_USTRINGPARAM(asdfa_mnvcnm));
-const rtl::OUString source5(RTL_CONSTASCII_USTRINGPARAM(_asdf1));
-const rtl::OUString source6(RTL_CONSTASCII_USTRINGPARAM(_6));
-const rtl::OUString source7(RTL_CONSTASCII_USTRINGPARAM(joxclk_));
-const rtl::OUString source8(RTL_CONSTASCII_USTRINGPARAM( asdf));
-const rtl::OUString source9(RTL_CONSTASCII_USTRINGPARAM( 19395 asdfa ));
-const rtl::OUString source10(RTL_CONSTASCII_USTRINGPARAM(\n1\n2\na sdf));
-const rtl::OUString source11(RTL_CONSTASCII_USTRINGPARAM(asdf.asdf));
-const rtl::OUString
[PATCH] fdo#57950: remove consecutive append in basctl with StringBu...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1486 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/86/1486/1 fdo#57950: remove consecutive append in basctl with StringBuffer Change-Id: I43464dd702c6b4a63df39b6a4b35bec63712d5e6 Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com --- M basctl/source/basicide/baside2.cxx 1 file changed, 2 insertions(+), 7 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1486 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I43464dd702c6b4a63df39b6a4b35bec63712d5e6 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
It seems that readBiffData( BiffInputStream rStrm ) is ot u...
Marcos Souza has abandoned this change. Change subject: It seems that readBiffData( BiffInputStream rStrm ) is ot used .. Patch Set 1: Abandoned Well, this is used... so abandon this patch. -- To view, visit https://gerrit.libreoffice.org/1413 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I8ab20ac6f8cf8fc4a5947eac6518aefba7953705 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Remove unused method from oox: dump
Marcos Souza has abandoned this change. Change subject: Remove unused method from oox: dump .. Patch Set 2: Abandoned This is used for debug porpouses... So leave it as is =D -- To view, visit https://gerrit.libreoffice.org/1409 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Iba22e1dbfffb90ee9894fb753e5f57cd7e378548 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Muthu Subramanian K muthus...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Remove empty method from sc
Marcos Souza has abandoned this change. Change subject: Remove empty method from sc .. Patch Set 1: Abandoned Will be used in the future -- To view, visit https://gerrit.libreoffice.org/1411 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I03a021be42687910424e3f1c6196b0bdfca7e524 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Remove unused ScTabPopShell
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1392 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/92/1392/1 Remove unused ScTabPopShell As Thomas Arnhold pointed, it seems that ScTabPopShell is useless. I did a full compile without ScTabPopShell and run sometimes cal, writer and all still works. Change-Id: Ia05d4fb53999b816101b5757153942df0c606022 Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com --- D sc/sdi/tabpopsh.sdi D sc/source/ui/inc/tabpopsh.hxx D sc/source/ui/view/tabpopsh.cxx 3 files changed, 0 insertions(+), 130 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1392 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia05d4fb53999b816101b5757153942df0c606022 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Remove unused method from oox: dump
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1409 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/09/1409/1 Remove unused method from oox: dump Change-Id: Iba22e1dbfffb90ee9894fb753e5f57cd7e378548 Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com --- M oox/inc/oox/drawingml/textliststyle.hxx M oox/source/drawingml/textliststyle.cxx M unusedcode.easy 3 files changed, 0 insertions(+), 15 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1409 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iba22e1dbfffb90ee9894fb753e5f57cd7e378548 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Remove unused method from sc: importBiffRecord
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1410 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/10/1410/1 Remove unused method from sc: importBiffRecord As Thomas Arnhold pointed, these method eems to be useless. After removing and running calc, it seems to work perfect. Change-Id: I3e3eb7ba3e2e71bb615f64d5f63ca7f8cac00e9c Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com --- M sc/source/filter/inc/autofilterbuffer.hxx M sc/source/filter/oox/autofilterbuffer.cxx 2 files changed, 0 insertions(+), 30 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1410 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3e3eb7ba3e2e71bb615f64d5f63ca7f8cac00e9c Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Remove empty method from sc
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1411 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/11/1411/1 Remove empty method from sc These methods are emprt and are called by another file. I don't if this is a kind of documentation, or this will be used in the future, because there isn't any comment about it. Change-Id: I03a021be42687910424e3f1c6196b0bdfca7e524 Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com --- M sc/source/filter/excel/impop.cxx M sc/source/filter/excel/read.cxx M sc/source/filter/inc/imp_op.hxx 3 files changed, 0 insertions(+), 34 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1411 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I03a021be42687910424e3f1c6196b0bdfca7e524 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
