[PATCH] String to OUString
Hello Andrzej J.R. Hunt, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/5817 to look at the new patch set (#2). Change subject: String to OUString .. String to OUString And removed nearly all xub_StrLen in starmath. Some sal_uInt16 which were xub_StrLen before 9a0d753b84aed53083bed3ed460308b771f432a8 are also converted to sal_Int32 where applicable. Change-Id: I31d7794f4c7aa840545edff41a102b76bb39e042 --- M starmath/inc/node.hxx M starmath/inc/parse.hxx M starmath/qa/cppunit/test_starmath.cxx M starmath/source/accessibility.cxx M starmath/source/edit.cxx M starmath/source/node.cxx M starmath/source/parse.cxx M starmath/source/smmod.cxx 8 files changed, 84 insertions(+), 95 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/17/5817/2 -- To view, visit https://gerrit.libreoffice.org/5817 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I31d7794f4c7aa840545edff41a102b76bb39e042 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Thomas Arnhold tho...@arnhold.org Gerrit-Reviewer: Andrzej J.R. Hunt andr...@ahunt.org Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] XubString to OUString
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/5802 Approvals: LibreOffice gerrit bot: Verified Thomas Arnhold: Michael Stahl: Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/5802 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia7514abaa494a367d51db9d9990cd94cff6ed503 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Thomas Arnhold tho...@arnhold.org Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Remove more unused methods
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/5789 Approvals: LibreOffice gerrit bot: Verified Thomas Arnhold: Verified; Looks good to me, approved Marcos Souza: Looks good to me, but someone else must approve -- To view, visit https://gerrit.libreoffice.org/5789 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8fec40d767905bcca366257a67f669eaa1055cbc 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: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Remove more unused methods
Hello LibreOffice gerrit bot, Marcos Souza, I'd like you to reexamine a rebased change. Please visit https://gerrit.libreoffice.org/5757 to look at the new rebased patch set (#2). Change subject: Remove more unused methods .. Remove more unused methods Change-Id: I79548f9dd1b83ef940e7a1302cf7b728610fed4a --- M basegfx/source/pixel/bpixel.cxx M formula/source/ui/dlg/formula.cxx M include/basegfx/pixel/bpixel.hxx M include/formula/formula.hxx M include/toolkit/controls/unocontrolbase.hxx M include/unotools/xmlaccelcfg.hxx M include/vcl/bmpacc.hxx M sd/source/ui/dlg/PhotoAlbumDialog.cxx M sd/source/ui/dlg/PhotoAlbumDialog.hxx M sd/source/ui/framework/tools/FrameworkHelper.cxx M sd/source/ui/inc/framework/FrameworkHelper.hxx M sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx M sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx M sfx2/source/sidebar/FocusManager.cxx M sfx2/source/sidebar/FocusManager.hxx M toolkit/source/controls/unocontrolbase.cxx M unotools/source/config/xmlaccelcfg.cxx M unusedcode.easy M vcl/inc/dbggui.hxx M vcl/source/app/dbggui.cxx M vcl/source/gdi/bmpacc.cxx M vcl/source/gdi/bmpacc3.cxx 22 files changed, 0 insertions(+), 321 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/57/5757/2 -- To view, visit https://gerrit.libreoffice.org/5757 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I79548f9dd1b83ef940e7a1302cf7b728610fed4a 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 Ostrovsky david.ostrov...@gmx.de Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Marcos Souza marcos.souza@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Remove more unused methods
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/5757 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/5757 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I79548f9dd1b83ef940e7a1302cf7b728610fed4a 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 Ostrovsky david.ostrov...@gmx.de Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] remove OUString wrap for string literals
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4624 Approvals: LibreOffice gerrit bot: Verified Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4624 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaf8e641b0abf28c082906014f87a183517630535 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Thomas Arnhold tho...@arnhold.org Gerrit-Reviewer: Björn Michaelsen bjoern.michael...@canonical.com Gerrit-Reviewer: David Ostrovsky david.ostrov...@gmx.de Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#43460 shell,vcl,xmlreader: use isEmpty()
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/ Approvals: LibreOffice gerrit bot: Verified Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/ To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie3d16da6c246b79c4c304b21476f84b2788f0d6e Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Jelle van der Waa je...@vdwaa.nl Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Replace invalid doxygen commands: thrown - throws
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4136 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4136 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9e9f513afe37ccf34f2d5762a27b4a728fd24f36 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Zolnai Tamás zolnaitamas2...@gmail.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#39468 Comment translation GER-ENG in sw/source/ui/uno
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4129 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4129 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia5ef91c120354ed868a69c3dbfc9cebe0fd61bab Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Make use of IsStarSymbol()
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4077
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/77/4077/1
Make use of IsStarSymbol()
Change-Id: I7a2e3a6f11bbaaaff50e8163e4ce3e2583b1d03c
---
M editeng/source/items/textitem.cxx
M include/unotools/fontdefs.hxx
M oox/source/export/drawingml.cxx
M sd/source/filter/eppt/pptx-text.cxx
M sw/source/filter/ww8/writerhelper.cxx
M sw/source/filter/ww8/writerhelper.hxx
M sw/source/filter/ww8/writerwordglue.cxx
M sw/source/filter/ww8/wrtw8num.cxx
M unotools/source/misc/fontcvt.cxx
M unotools/source/misc/fontdefs.cxx
M vcl/generic/fontmanager/fontsubst.cxx
M vcl/generic/glyphs/gcach_ftyp.cxx
M vcl/source/filter/wmf/wmfwr.cxx
M vcl/source/gdi/metaact.cxx
M vcl/source/gdi/outdev3.cxx
15 files changed, 34 insertions(+), 50 deletions(-)
diff --git a/editeng/source/items/textitem.cxx
b/editeng/source/items/textitem.cxx
index 51995af..f9f342e 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -373,9 +373,7 @@
SvStream SvxFontItem::Store( SvStream rStrm , sal_uInt16 /*nItemVersion*/ )
const
{
-sal_Bool bToBats =
-GetFamilyName().EqualsIgnoreCaseAscii( StarSymbol, 0,
sizeof(StarSymbol)-1 ) ||
-GetFamilyName().EqualsIgnoreCaseAscii( OpenSymbol, 0,
sizeof(OpenSymbol)-1 );
+sal_Bool bToBats = IsStarSymbol( GetFamilyName() );
rStrm (sal_uInt8) GetFamily() (sal_uInt8) GetPitch()
(sal_uInt8)(bToBats ? RTL_TEXTENCODING_SYMBOL :
GetSOStoreTextEncoding(GetCharSet()));
diff --git a/include/unotools/fontdefs.hxx b/include/unotools/fontdefs.hxx
index 60c37d4..d1bf777 100644
--- a/include/unotools/fontdefs.hxx
+++ b/include/unotools/fontdefs.hxx
@@ -90,6 +90,15 @@
UNOTOOLS_DLLPUBLIC void GetEnglishSearchFontName( OUString rName );
+/** Determine if the font is the special Star|Open Symbol font
+
+@param rFontName
+The FontName to test for being Star|Open Symbol
+
+@return true if this is Star|Open Symbol
+*/
+UNOTOOLS_DLLPUBLIC bool IsStarSymbol(const OUString rFontName);
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 6d73d3d..8cbeead 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1483,7 +1483,7 @@
sal_Unicode DrawingML::SubstituteBullet( sal_Unicode cBulletId,
::com::sun::star::awt::FontDescriptor rFontDesc )
{
-if ( rFontDesc.Name.equalsIgnoreAsciiCase(starsymbol) ||
rFontDesc.Name.equalsIgnoreAsciiCase(opensymbol) )
+if ( IsStarSymbol(rFontDesc.Name) )
{
rtl_TextEncoding eCharSet = rFontDesc.CharSet;
cBulletId = msfilter::util::bestFitOpenSymbolToMSFont(cBulletId,
eCharSet, rFontDesc.Name);
diff --git a/sd/source/filter/eppt/pptx-text.cxx
b/sd/source/filter/eppt/pptx-text.cxx
index 22c713f..e96a03f 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -884,7 +884,7 @@
case SVX_NUM_CHAR_SPECIAL : //
Bullet
{
-if (
aFontDesc.Name.equalsIgnoreAsciiCase(starsymbol) ||
aFontDesc.Name.equalsIgnoreAsciiCase(opensymbol) )
+if ( IsStarSymbol(aFontDesc.Name) )
{
rtl_TextEncoding eChrSet = aFontDesc.CharSet;
cBulletId =
msfilter::util::bestFitOpenSymbolToMSFont(cBulletId, eChrSet, aFontDesc.Name);
diff --git a/sw/source/filter/ww8/writerhelper.cxx
b/sw/source/filter/ww8/writerhelper.cxx
index 228bc59..664d5aa 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -666,14 +666,6 @@
}
}
-bool IsStarSymbol(const OUString rFontName)
-{
-sal_Int32 nIndex = 0;
-OUString sFamilyNm(GetNextFontToken(rFontName, nIndex));
-return (sFamilyNm.equalsIgnoreAsciiCase(starsymbol) ||
-sFamilyNm.equalsIgnoreAsciiCase(opensymbol));
-}
-
Size GetSwappedInSize(const SwNoTxtNode rNd)
{
Size aGrTwipSz(rNd.GetTwipSize());
diff --git a/sw/source/filter/ww8/writerhelper.hxx
b/sw/source/filter/ww8/writerhelper.hxx
index 52bfba7..e411ac8 100644
--- a/sw/source/filter/ww8/writerhelper.hxx
+++ b/sw/source/filter/ww8/writerhelper.hxx
@@ -747,18 +747,6 @@
*/
Polygon PolygonFromPolyPolygon(const PolyPolygon rPolyPoly);
-/** Determine if the font is the special Star|Open Symbol font
-
-@param rFontName
-The FontName to test for being Star|Open Symbol
-
-@return true if this is Star|Open Symbol
-
-@author
-a href=mailto:c...@openoffice.org;Caolaacute;n McNamara/a
-*/
-bool IsStarSymbol(const OUString rFontName);
-
/** Make setting a drawing
[PATCH] fdo#60724 change spelling error REMOVEABLE - REMOVABLE II
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4078
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/78/4078/1
fdo#60724 change spelling error REMOVEABLE - REMOVABLE II
Change-Id: I0057b9174af6a83f3fde0e27c3a91a4aeca95873
---
M idlc/inc/idlc/astattribute.hxx
M idlc/inc/idlc/idlctypes.hxx
M idlc/source/astdump.cxx
M idlc/source/errorhandler.cxx
M idlc/source/parser.y
M idlc/source/scanner.l
M idlc/test/parser/attribute.tests
M include/comphelper/propertybag.hxx
M include/registry/types.h
M include/svtools/imagemgr.hrc
M padmin/source/padialog.cxx
M padmin/source/padialog.hrc
M padmin/source/padialog.src
M qadevOOo/tests/java/ifc/beans/_XPropertyContainer.java
M registry/source/regimpl.cxx
M registry/tools/regcompare.cxx
M sfx2/source/control/templateremoteview.cxx
M stoc/source/registry_tdprovider/tdservice.cxx
M svtools/source/contnr/contentenumeration.cxx
M svtools/source/misc/imagemgr.cxx
M svtools/source/misc/imagemgr.src
M unoidl/source/legacyprovider.cxx
22 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/idlc/inc/idlc/astattribute.hxx b/idlc/inc/idlc/astattribute.hxx
index 7f88e49..7cc3a65 100644
--- a/idlc/inc/idlc/astattribute.hxx
+++ b/idlc/inc/idlc/astattribute.hxx
@@ -90,7 +90,7 @@
sal_Bool isMayBeDefault() const
{ return ((m_flags AF_MAYBEDEFAULT) == AF_MAYBEDEFAULT); }
sal_Bool isRemoveable() const
-{ return ((m_flags AF_REMOVEABLE) == AF_REMOVEABLE); }
+{ return ((m_flags AF_REMOVABLE) == AF_REMOVABLE); }
sal_Bool dumpBlob(
typereg::Writer rBlob, sal_uInt16 index, sal_uInt16 * methodIndex);
diff --git a/idlc/inc/idlc/idlctypes.hxx b/idlc/inc/idlc/idlctypes.hxx
index 32214d6..842ef68 100644
--- a/idlc/inc/idlc/idlctypes.hxx
+++ b/idlc/inc/idlc/idlctypes.hxx
@@ -87,7 +87,7 @@
#define AF_TRANSIENT0x0020
#define AF_MAYBEAMBIGUOUS 0x0040
#define AF_MAYBEDEFAULT 0x0080
-#define AF_REMOVEABLE 0x0100
+#define AF_REMOVABLE0x0100
#define AF_ATTRIBUTE0x0200
#define AF_PROPERTY 0x0400
diff --git a/idlc/source/astdump.cxx b/idlc/source/astdump.cxx
index fd5e2db..492714c 100644
--- a/idlc/source/astdump.cxx
+++ b/idlc/source/astdump.cxx
@@ -366,7 +366,7 @@
}
if (isRemoveable())
{
-accessMode |= RT_ACCESS_REMOVEABLE;
+accessMode |= RT_ACCESS_REMOVABLE;
}
OUString name(OStringToOUString(getLocalName(), RTL_TEXTENCODING_UTF8));
diff --git a/idlc/source/errorhandler.cxx b/idlc/source/errorhandler.cxx
index 390d76e..f591f0b 100644
--- a/idlc/source/errorhandler.cxx
+++ b/idlc/source/errorhandler.cxx
@@ -456,7 +456,7 @@
flagStr += 'maybeambiguous';
if ( (flag AF_MAYBEDEFAULT) == AF_MAYBEDEFAULT )
flagStr += 'maybedefault';
-if ( (flag AF_REMOVEABLE) == AF_REMOVEABLE )
+if ( (flag AF_REMOVABLE) == AF_REMOVABLE )
flagStr += 'removable';
if ( (flag AF_ATTRIBUTE) == AF_ATTRIBUTE )
flagStr += 'attribute';
diff --git a/idlc/source/parser.y b/idlc/source/parser.y
index 528bc96..7bfdea2 100644
--- a/idlc/source/parser.y
+++ b/idlc/source/parser.y
@@ -271,7 +271,7 @@
%token IDL_PROPERTY
%token IDL_RAISES
%token IDL_READONLY
-%token IDL_REMOVEABLE
+%token IDL_REMOVABLE
%token IDL_SERVICE
%token IDL_SEQUENCE
%token IDL_SINGLETON
@@ -848,10 +848,10 @@
idlc()-setParseState(PS_MayBeDefaultSeen);
$$ = AF_MAYBEDEFAULT;
}
- | IDL_REMOVEABLE
+ | IDL_REMOVABLE
{
idlc()-setParseState(PS_RemoveableSeen);
- $$ = AF_REMOVEABLE;
+ $$ = AF_REMOVABLE;
}
| error ']'
{
diff --git a/idlc/source/scanner.l b/idlc/source/scanner.l
index 51204b8..d13160e 100644
--- a/idlc/source/scanner.l
+++ b/idlc/source/scanner.l
@@ -307,7 +307,7 @@
propertyreturn IDL_PROPERTY;
raises return IDL_RAISES;
readonlyreturn IDL_READONLY;
-removable return IDL_REMOVEABLE;
+removable return IDL_REMOVABLE;
service return IDL_SERVICE;
sequencereturn IDL_SEQUENCE;
singleton return IDL_SINGLETON;
diff --git a/idlc/test/parser/attribute.tests b/idlc/test/parser/attribute.tests
index 1e9b28d..bc6753f 100644
--- a/idlc/test/parser/attribute.tests
+++ b/idlc/test/parser/attribute.tests
@@ -194,7 +194,7 @@
EXPECT FAILURE attribute.tests 23:
interface I1 {
-[attribute, removeable] long a;
+[attribute, removable] long a;
};
diff --git a/include/comphelper/propertybag.hxx
b/include/comphelper/propertybag.hxx
index 92c0026..1be1309 100644
--- a/include/comphelper/propertybag.hxx
+++ b/include/comphelper/propertybag.hxx
@@ -118,7 +118,7 @@
@throws
[PATCH] fdo#39468 - translate German comments
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4079
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/79/4079/1
fdo#39468 - translate German comments
Change-Id: I1324c2682873112fa7702b94fcaceab6de0b94d1
---
M rsc/inc/rscrsc.hxx
M rsc/source/prj/start.cxx
M rsc/source/rscpp/cpp3.c
M sc/source/ui/dbgui/asciiopt.cxx
M sc/source/ui/dbgui/imoptdlg.cxx
M sc/source/ui/docshell/docsh8.cxx
M sc/source/ui/miscdlgs/mtrindlg.cxx
7 files changed, 102 insertions(+), 90 deletions(-)
diff --git a/rsc/inc/rscrsc.hxx b/rsc/inc/rscrsc.hxx
index d5a768e..579049d 100644
--- a/rsc/inc/rscrsc.hxx
+++ b/rsc/inc/rscrsc.hxx
@@ -40,12 +40,12 @@
public:
-RscStrList aInputList; // Liste der Quelldateien
-OStringaPath; // Liste der Pfade
+RscStrList aInputList; // List of source files
+OString aPath; // List of paths
RSCBYTEORDER_TYPE nByteOrder;
-unsigned short nCommands; // Steuerbits
-OStringaOutputSrs; // Name der Srs-Ausgabedatei
-OStringaILDir;
+unsigned short nCommands; // control bits
+OString aOutputSrs; // Name of the Srs output file
+OString aILDir;
struct OutputFile
{
@@ -86,10 +86,10 @@
const OUString rSrsOutPath );
public:
-RscTypCont* pTC;// String und Id-Verwalter
-RscCmdLine* pCL;// Kommandozeile
-FILE * fListing; // Ausgabedatei fuer Listings
-FILE * fExitFile; // bei Abbruch muss diese Datei geschlossen
werden
+RscTypCont* pTC;// String and Id manager
+RscCmdLine* pCL;// Command line
+FILE * fListing; // Output file for listings
+FILE * fExitFile; // in case of abortion this file must be closed
RscCompiler( RscCmdLine *, RscTypCont * );
~RscCompiler();
diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx
index f15472c..2c8c271 100644
--- a/rsc/source/prj/start.cxx
+++ b/rsc/source/prj/start.cxx
@@ -50,8 +50,8 @@
const OString rOutput, RscPtrPtr * pCmdLine,
sal_Bool bResponse )
{
-RscPtrPtr aNewCmdL; // Kommandozeile
-RscPtrPtr aRespCmdL; // Kommandozeile
+RscPtrPtr aNewCmdL; // Command line
+RscPtrPtr aRespCmdL; // Command line
RscPtrPtr * pCmdL = aNewCmdL;
int i, nRet;
FILE* fRspFile = NULL;
@@ -216,7 +216,7 @@
RscStrList aTmpList;
char * pStr;
char ** ppStr;
-RscPtrPtr aCmdLine; // Kommandozeile
+RscPtrPtr aCmdLine; // Command line
sal_uInt32 i;
OString* pString;
@@ -260,7 +260,7 @@
}
else
{
-// Eingabedatei
+// Input file
aInputList.push_back( new OString(*ppStr) );
}
ppStr++;
diff --git a/rsc/source/rscpp/cpp3.c b/rsc/source/rscpp/cpp3.c
index df5a2c7..dad521a 100644
--- a/rsc/source/rscpp/cpp3.c
+++ b/rsc/source/rscpp/cpp3.c
@@ -29,7 +29,7 @@
#include string.h
#ifndef _NO_PROTO
-int AddInclude( char *pIncStr ); /* BP, 11.09.91, Forward-Deklaration */
+int AddInclude( char *pIncStr ); /* BP, 11.09.91, Forward declaration */
#endif
#if (OSL_DEBUG_LEVEL 1) (HOST == SYS_VMS || HOST == SYS_UNIX)
@@ -146,15 +146,15 @@
#if HOST == SYS_UNKNOWN
/*
- * Kontext: GenMake
- * Unter DOS wird nun auch die Environment-Variable INCLUDE ausgewetet.
- * Es kommt erschwerend hinzu, dass alle Eintraege, die mit ';' getrennt
- * sind, mit in die Liste aufenommen werden muessen.
- * Dies wird mit der Funktion strtok() realisiert.
- * Vorsicht bei der Benutzung von malloc !!!
- * In savestring wird naemlich getmem() verwendet. Vermutlich kommen sich
- * die beiden Funktion in die Quere. Als ich malloc statt savestring
- * verwendete knallte es in strcpy() !
+ * Context: GenMake
+ * Under DOS the environment variable INCLUDE is now also analysed.
+ * To make things more complicated, all entries that are separated by ';',
+ * have to be added to the list.
+ * This is realised by function strtok().
+ * Be careful when using malloc !!!
+ * In savestring is getmem() used. Probably these two functions get in
+ * the way of each other. When I used malloc instead of savestring it crashed
+ * in strcpy() !
*/
#if !defined( WNT ) ! defined UNX
@@ -171,18 +171,18 @@
}
-/* Kontext: Erweiterung des INCLUDE-Services
- * Bislang konnte der cpp keine Include-Angaben in der Kommandozeile
- * vertragen, bei denen die directries mit ';' getrennt wurden.
- * Dies ist auch verstaendlich, da dieses cpp fuer UNIX-Systeme
- * massgeschneidert wurde und in UNI die ';' als Zeichen zum Abschluss
- * von Kommandos gilt.
+/*
+ * Context: Enhancement of the INCLUDE service
+ * Up to now
[PATCH] fdo#63351 make use of ZoomSlider in StarMath
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4053
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/53/4053/1
fdo#63351 make use of ZoomSlider in StarMath
In collaboration with Marcos Souza marcos.souza@gmail.com :)
Includes some reordering of the statusbar: Zoom and ZoomSlider right,
left field with automatic size adjustment.
Change-Id: Ibfb1eab1abef7b026eeb7fd7c0a778c433c9e208
---
M starmath/sdi/smslots.sdi
M starmath/source/smdll.cxx
M starmath/source/typemap.cxx
M starmath/source/view.cxx
M starmath/uiconfig/smath/statusbar/statusbar.xml
5 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/starmath/sdi/smslots.sdi b/starmath/sdi/smslots.sdi
index 7104423..5db0d63 100644
--- a/starmath/sdi/smslots.sdi
+++ b/starmath/sdi/smslots.sdi
@@ -283,6 +283,11 @@
ExecMethod = Execute ;
StateMethod = GetState ;
]
+SID_ATTR_ZOOMSLIDER
+[
+ExecMethod = Execute ;
+StateMethod = GetState ;
+]
//idlpp kein Menueeintrag , also keine Texte
SID_TEXTSTATUS //idlpp ole : no , status : no
[
diff --git a/starmath/source/smdll.cxx b/starmath/source/smdll.cxx
index e25dca4..f1a1bc6 100644
--- a/starmath/source/smdll.cxx
+++ b/starmath/source/smdll.cxx
@@ -21,6 +21,7 @@
#include svx/svxids.hrc
#include svx/modctrl.hxx
#include svx/zoomctrl.hxx
+#include svx/zoomsliderctrl.hxx
#include sfx2/docfac.hxx
#include svx/lboxctrl.hxx
#include sfx2/docfile.hxx
@@ -67,6 +68,7 @@
SmViewShell::RegisterFactory(1);
SvxZoomStatusBarControl::RegisterControl(SID_ATTR_ZOOM, pModule);
+SvxZoomSliderControl::RegisterControl(SID_ATTR_ZOOMSLIDER, pModule);
SvxModifyControl::RegisterControl(SID_TEXTSTATUS, pModule);
SvxUndoRedoControl::RegisterControl(SID_UNDO, pModule);
SvxUndoRedoControl::RegisterControl(SID_REDO, pModule);
diff --git a/starmath/source/typemap.cxx b/starmath/source/typemap.cxx
index c53224d..2d354f7 100644
--- a/starmath/source/typemap.cxx
+++ b/starmath/source/typemap.cxx
@@ -21,6 +21,7 @@
#include svl/stritem.hxx
#include svl/eitem.hxx
#include sfx2/zoomitem.hxx
+#include svx/zoomslideritem.hxx
#include svx/svxids.hrc
#include svl/slstitm.hxx
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index d144dde..ee6a1a3 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -51,6 +51,7 @@
#include svl/undo.hxx
#include svl/whiter.hxx
#include svx/dialogs.hrc
+#include svx/zoomslideritem.hxx
#include editeng/editeng.hxx
#include svx/svxdlg.hxx
#include sfx2/zoomitem.hxx
@@ -613,7 +614,10 @@
SetTotalSize();
SmViewShell *pViewSh = GetView();
if (pViewSh)
+{
pViewSh-GetViewFrame()-GetBindings().Invalidate(SID_ATTR_ZOOM);
+pViewSh-GetViewFrame()-GetBindings().Invalidate(SID_ATTR_ZOOMSLIDER);
+}
Invalidate();
}
@@ -1853,6 +1857,19 @@
}
break;
+case SID_ATTR_ZOOMSLIDER:
+{
+const SfxItemSet *pArgs = rReq.GetArgs();
+const SfxPoolItem* pItem;
+
+if ( pArgs SFX_ITEM_SET ==
pArgs-GetItemState(SID_ATTR_ZOOMSLIDER, sal_True, pItem ) )
+{
+const sal_uInt16 nCurrentZoom = ((const SvxZoomSliderItem
*)pItem)-GetValue();
+aGraphic.SetZoom( nCurrentZoom );
+}
+}
+break;
+
case SID_TOOLBOX:
{
GetViewFrame()-ToggleChildWindow(
SmToolBoxWrapper::GetChildWindowId() );
@@ -1936,6 +1953,15 @@
rSet.DisableItem( nWh );
break;
+case SID_ATTR_ZOOMSLIDER :
+{
+const sal_uInt16 nCurrentZoom = aGraphic.GetZoom();
+SvxZoomSliderItem aZoomSliderItem( nCurrentZoom, MINZOOM,
MAXZOOM );
+aZoomSliderItem.AddSnappingPoint( 100 );
+rSet.Put( aZoomSliderItem );
+}
+break;
+
case SID_NEXTERR:
case SID_PREVERR:
case SID_NEXTMARK:
diff --git a/starmath/uiconfig/smath/statusbar/statusbar.xml
b/starmath/uiconfig/smath/statusbar/statusbar.xml
index 134507e..3c00de9 100644
--- a/starmath/uiconfig/smath/statusbar/statusbar.xml
+++ b/starmath/uiconfig/smath/statusbar/statusbar.xml
@@ -18,8 +18,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
--
statusbar:statusbar xmlns:statusbar=http://openoffice.org/2001/statusbar;
xmlns:xlink=http://www.w3.org/1999/xlink;
- statusbar:statusbaritem xlink:href=.uno:TextStatus statusbar:align=left
statusbar:width=300/
- statusbar:statusbaritem xlink:href=.uno:Zoom statusbar:align=center
statusbar:width=54/
+ statusbar:statusbaritem xlink:href=.uno:TextStatus statusbar:align=left
statusbar:autosize=true statusbar:width=300/
statusbar:statusbaritem xlink:href=.uno:ModifiedStatus
statusbar:align=center statusbar:ownerdraw=true statusbar:width=9/
[PUSHED] fix OUString conversion
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4035 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4035 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2cf61d88c79b3ab33c0ee7d077ee65b16053c05c Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Sean Young s...@mess.org Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] be case-insensitive for open/starsymbol comparison
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4015
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/15/4015/1
be case-insensitive for open/starsymbol comparison
Change-Id: I7a342c809a723f5f9c03271c6145d9c367cea6de
---
M editeng/source/items/textitem.cxx
M oox/source/export/drawingml.cxx
M sd/source/filter/eppt/pptx-text.cxx
M unotools/source/misc/fontcvt.cxx
M unotools/source/misc/fontdefs.cxx
M vcl/generic/glyphs/gcach_ftyp.cxx
6 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/editeng/source/items/textitem.cxx
b/editeng/source/items/textitem.cxx
index c026f1d..51995af 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -374,8 +374,8 @@
SvStream SvxFontItem::Store( SvStream rStrm , sal_uInt16 /*nItemVersion*/ )
const
{
sal_Bool bToBats =
-GetFamilyName().EqualsAscii( StarSymbol, 0, sizeof(StarSymbol)-1 )
||
-GetFamilyName().EqualsAscii( OpenSymbol, 0, sizeof(OpenSymbol)-1 );
+GetFamilyName().EqualsIgnoreCaseAscii( StarSymbol, 0,
sizeof(StarSymbol)-1 ) ||
+GetFamilyName().EqualsIgnoreCaseAscii( OpenSymbol, 0,
sizeof(OpenSymbol)-1 );
rStrm (sal_uInt8) GetFamily() (sal_uInt8) GetPitch()
(sal_uInt8)(bToBats ? RTL_TEXTENCODING_SYMBOL :
GetSOStoreTextEncoding(GetCharSet()));
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 6f28d92..6d73d3d 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1077,7 +1077,7 @@
// instead of a Unicode encoding the encoding
RTL_TEXTENCODING_SYMBOL was used.
// Because there might exist a lot of damaged
documemts I added this two lines
// which fixes the bullet problem for the export.
-if ( aFontDesc.Name == StarSymbol )
+if (
aFontDesc.Name.equalsIgnoreAsciiCase(StarSymbol) )
aFontDesc.CharSet = RTL_TEXTENCODING_MS_1252;
} else if ( aPropName == BulletRelSize ) {
diff --git a/sd/source/filter/eppt/pptx-text.cxx
b/sd/source/filter/eppt/pptx-text.cxx
index adadc44..22c713f 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -798,7 +798,7 @@
// instead of a Unicode encoding the encoding
RTL_TEXTENCODING_SYMBOL was used.
// Because there might exist a lot of damaged
documemts I added this two lines
// which fixes the bullet problem for the export.
-if ( aFontDesc.Name == StarSymbol )
+if (
aFontDesc.Name.equalsIgnoreAsciiCase(StarSymbol) )
aFontDesc.CharSet = RTL_TEXTENCODING_MS_1252;
}
@@ -884,7 +884,7 @@
case SVX_NUM_CHAR_SPECIAL : //
Bullet
{
-if ( aFontDesc.Name.equals(starsymbol) ||
aFontDesc.Name.equals(opensymbol) )
+if (
aFontDesc.Name.equalsIgnoreAsciiCase(starsymbol) ||
aFontDesc.Name.equalsIgnoreAsciiCase(opensymbol) )
{
rtl_TextEncoding eChrSet = aFontDesc.CharSet;
cBulletId =
msfilter::util::bestFitOpenSymbolToMSFont(cBulletId, eChrSet, aFontDesc.Name);
diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index ed34a5b..9a92c7e 100644
--- a/unotools/source/misc/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.cxx
@@ -1438,6 +1438,7 @@
OUString aOrgName( rOrgFontName );
GetEnglishSearchFontName( aOrgName );
OUString aMapName( rMapFontName );
+// clean up and lowercase font name
GetEnglishSearchFontName( aMapName );
if( aMapName == starsymbol
diff --git a/unotools/source/misc/fontdefs.cxx
b/unotools/source/misc/fontdefs.cxx
index 4132b5d..0932c17 100644
--- a/unotools/source/misc/fontdefs.cxx
+++ b/unotools/source/misc/fontdefs.cxx
@@ -525,6 +525,7 @@
sal_Int32 nIndex = 0;
OUString aOrgName = GetNextFontToken( rName, nIndex );
+// clean up and lowercase font name
GetEnglishSearchFontName( aOrgName );
// #93662# do not try to replace StarSymbol with MS only font
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx
b/vcl/generic/glyphs/gcach_ftyp.cxx
index 162ba11..bed75cf 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -921,8 +921,8 @@
//Always consider [star]symbol as symbol fonts
if (
- (rTo.GetFamilyName() == OpenSymbol ) ||
- (rTo.GetFamilyName() == StarSymbol )
+ (rTo.GetFamilyName().equalsIgnoreAsciiCase(OpenSymbol)) ||
+ (rTo.GetFamilyName().equalsIgnoreAsciiCase(StarSymbol))
)
{
[PUSHED] fdo#39468 Comment translation GER-ENG
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3965 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3965 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I503a12e22d03b2b57a818701cdfbe4ecc94d89a1 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Changed compareTo to startsWith
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3956 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3956 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia72e220f29c26bdf789bd3f1102b850aafcf525d Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ricardo Botto andarilho.bo...@gmail.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#39468 Translate German comments - graphicfilter
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3955 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3955 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4e64c2d9ca8d85251a4cde5d3ab68f0956a4f0d1 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian M. Heller christian.helle...@gmail.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#39468 Comment translation GER-ENG in sw/source/ui/ribbar...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3924 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3924 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2eccf057fecf6151c4604656464f3d8d1f6a7788 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org Gerrit-Reviewer: Thorsten Behrens tbehr...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Update pch
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3831 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3831 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7c0c9158eb17cb79ffceae6770b4c513d57b3817 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Aurimas Fišeras auri...@members.fsf.org Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Remove useless commented out code.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3631 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3631 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iec64115692b1f51ec1466dd57f8049c6f3aaa82b Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Chris Sherlock chris.sherloc...@gmail.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#63749: #118845# corrected missing ressource for gallery ...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3507
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/07/3507/1
fdo#63749: #118845# corrected missing ressource for gallery theme htmlexpo
(cherry picked from commit fee688fd96329f628f83623ea91c32e10eeb134b)
Conflicts:
svx/inc/svx/gallery.hxx
Change-Id: I263bc8bcd4232d8e9b4a971fd611b451840618a3
---
D extras/source/gallery/gallery_system/sg25.sdg
D extras/source/gallery/gallery_system/sg25.sdv
D extras/source/gallery/gallery_system/sg25.thm
M svx/inc/galtheme.hrc
M svx/inc/svx/gallery.hxx
M svx/source/gallery2/galtheme.src
6 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/extras/source/gallery/gallery_system/sg25.sdg
b/extras/source/gallery/gallery_system/sg25.sdg
deleted file mode 100644
index af78e56..000
--- a/extras/source/gallery/gallery_system/sg25.sdg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/gallery_system/sg25.sdv
b/extras/source/gallery/gallery_system/sg25.sdv
deleted file mode 100644
index 4449591..000
--- a/extras/source/gallery/gallery_system/sg25.sdv
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/gallery_system/sg25.thm
b/extras/source/gallery/gallery_system/sg25.thm
deleted file mode 100644
index e7b0a49..000
--- a/extras/source/gallery/gallery_system/sg25.thm
+++ /dev/null
Binary files differ
diff --git a/svx/inc/galtheme.hrc b/svx/inc/galtheme.hrc
index 7eda727..52b9fdd 100644
--- a/svx/inc/galtheme.hrc
+++ b/svx/inc/galtheme.hrc
@@ -39,7 +39,7 @@
#define RID_GALLERYSTR_THEME_MAPS (RID_GALLERYSTR_THEME_START + 12)
#define RID_GALLERYSTR_THEME_PEOPLE
(RID_GALLERYSTR_THEME_START + 13)
#define RID_GALLERYSTR_THEME_SURFACES
(RID_GALLERYSTR_THEME_START + 14)
-// free
+#define RID_GALLERYSTR_THEME_HTMLBUTTONS
(RID_GALLERYSTR_THEME_START + 15)
#define RID_GALLERYSTR_THEME_POWERPOINT
(RID_GALLERYSTR_THEME_START + 16)
#define RID_GALLERYSTR_THEME_SOUNDS (RID_GALLERYSTR_THEME_START + 18)
#define RID_GALLERYSTR_THEME_SYMBOLS
(RID_GALLERYSTR_THEME_START + 19)
diff --git a/svx/inc/svx/gallery.hxx b/svx/inc/svx/gallery.hxx
index f7b7b56..a2b010b 100644
--- a/svx/inc/svx/gallery.hxx
+++ b/svx/inc/svx/gallery.hxx
@@ -41,6 +41,7 @@
#define GALLERY_THEME_3D1
#define GALLERY_THEME_BULLETS 3
#define GALLERY_THEME_HOMEPAGE 10
+#define GALLERY_THEME_HTMLBUTTONS 15
#define GALLERY_THEME_POWERPOINT16
#define GALLERY_THEME_SOUNDS18
#define GALLERY_THEME_USERSOUNDS21
diff --git a/svx/source/gallery2/galtheme.src b/svx/source/gallery2/galtheme.src
index 34650c5..4b63b82 100644
--- a/svx/source/gallery2/galtheme.src
+++ b/svx/source/gallery2/galtheme.src
@@ -119,6 +119,14 @@
//
-
+String RID_GALLERYSTR_THEME_HTMLBUTTONS
+{
+// !!! Don't translate, please !!!
+Text = private://gallery/hidden/HtmlExportButtons;
+};
+
+//
-
+
String RID_GALLERYSTR_THEME_POWERPOINT
{
// !!! Don't translate, please !!!
--
To view, visit https://gerrit.libreoffice.org/3507
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I263bc8bcd4232d8e9b4a971fd611b451840618a3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Thomas Arnhold tho...@arnhold.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Update pch
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3427 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3427 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ice80350184f7a514d5beab0a5e1da5b98d5733e4 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Aurimas Fišeras auri...@members.fsf.org Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#62096 - replace some O(U)String compareTo with ==
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3422 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3422 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I98d04d7da4c2b7ea0b769df9c2bfa8c1ad86bf2d Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Artur Dryomov artur.dryo...@gmail.com Gerrit-Reviewer: Artur Dryomov artur.dryo...@gmail.com Gerrit-Reviewer: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fix Serbian dictionary makefile
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3428 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/dictionaries refs/changes/28/3428/1 fix Serbian dictionary makefile Change-Id: I49e678fc586c2352e9df805e8e32e645605144da --- M Dictionary_sr.mk 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dictionary_sr.mk b/Dictionary_sr.mk index 93a530f..b506f2f 100644 --- a/Dictionary_sr.mk +++ b/Dictionary_sr.mk @@ -10,11 +10,11 @@ $(eval $(call gb_Dictionary_Dictionary,dict-sr,dictionaries/sr)) $(eval $(call gb_Dictionary_add_root_files,dict-sr,\ - dictionaries/sr/hyph_sh.dic \ + dictionaries/sr/hyph_sr-Latn.dic \ dictionaries/sr/hyph_sr.dic \ dictionaries/sr/README.txt \ - dictionaries/sr/sh.aff \ - dictionaries/sr/sh.dic \ + dictionaries/sr/sr-Latn.aff \ + dictionaries/sr/sr-Latn.dic \ dictionaries/sr/sr.aff \ dictionaries/sr/sr.dic \ )) -- To view, visit https://gerrit.libreoffice.org/3428 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I49e678fc586c2352e9df805e8e32e645605144da Gerrit-PatchSet: 1 Gerrit-Project: dictionaries Gerrit-Branch: master Gerrit-Owner: Thomas Arnhold tho...@arnhold.org Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] fix Serbian dictionary makefile
Thomas Arnhold has abandoned this change. Change subject: fix Serbian dictionary makefile .. Patch Set 1: Abandoned hrm... -- To view, visit https://gerrit.libreoffice.org/3428 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I49e678fc586c2352e9df805e8e32e645605144da Gerrit-PatchSet: 1 Gerrit-Project: dictionaries Gerrit-Branch: master Gerrit-Owner: Thomas Arnhold tho...@arnhold.org Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] update dictionaries
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3429 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/29/3429/1 update dictionaries Change-Id: I0f693266b7c3621f885acbe450f4faead3d8284f --- M dictionaries 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/dictionaries b/dictionaries index b32611e..66a5a2e 16 --- a/dictionaries +++ b/dictionaries -Subproject commit b32611e23a1f35f16f4c37bbbdc02027157424d1 +Subproject commit 66a5a2e03573ab1862db1965f7b9c5419db3decd -- To view, visit https://gerrit.libreoffice.org/3429 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0f693266b7c3621f885acbe450f4faead3d8284f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] update dictionaries
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3429 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3429 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0f693266b7c3621f885acbe450f4faead3d8284f Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Thomas Arnhold tho...@arnhold.org Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3423 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3423 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie5d3ae7d2c5dbaaed30d0b39740748845c9f1641 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ioan Radu ioan.rad...@gmail.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] General cleanup of OfficeBeans
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3413 Approvals: Noel Grandin: Looks good to me, but someone else must approve Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3413 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4133908ceac874b273fe409d763b3ddbfc2055e5 Gerrit-PatchSet: 8 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Chris Sherlock chris.sherloc...@gmail.com Gerrit-Reviewer: Chris Sherlock chris.sherloc...@gmail.com Gerrit-Reviewer: Noel Grandin noelgran...@gmail.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] scp: remove unused macros
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3410
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/10/3410/1
scp: remove unused macros
Change-Id: I48ac97bd6ac8cbd534e50c617f3d54ff10bd2908
---
M scp2/macros/macro.pl
M scp2/source/ooo/directory_ooo.scp
2 files changed, 0 insertions(+), 314 deletions(-)
diff --git a/scp2/macros/macro.pl b/scp2/macros/macro.pl
index dc5d2a9..19c69d1 100644
--- a/scp2/macros/macro.pl
+++ b/scp2/macros/macro.pl
@@ -61,7 +61,6 @@
write_DIR_ISOLANGUAGE_ALL_LANG_2();
write_DIR_ISOLANGUAGE_ALL_LANG();
write_DIR_ISOLANGUAGE_ALL_LANG_LPROJ();
-write_DIR_IDENT_ALL_LANG();
write_EXTRA_ALL_LANG();
write_EXTRA_ALL_LANG_BUT_EN_US();
write_EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG();
@@ -121,16 +120,6 @@
my $speciallang = $lang;
if ( $speciallang eq en-US ) { $speciallang = en; }
print OUTFILE \\\n\tDosName ($lang) = \$speciallang.lproj\;
-print OUTFILE ; if ( $lang ne $completelangiso[$#completelangiso]);
-}
-print OUTFILE \n\n;
-}
-
-sub write_DIR_IDENT_ALL_LANG
-{
-print OUTFILE #define DIR_IDENT_ALL_LANG(name) ;
-foreach $lang (@completelangiso) {
-print OUTFILE \\\n\tDosName ($lang) = STRING(name);
print OUTFILE ; if ( $lang ne $completelangiso[$#completelangiso]);
}
print OUTFILE \n\n;
diff --git a/scp2/source/ooo/directory_ooo.scp
b/scp2/source/ooo/directory_ooo.scp
index 6012032..f1b412d 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -69,22 +69,6 @@
End
#endif
-#if defined MACOSX
-Unixlink gid_Unixlink_Applications
-BIN_FILE_BODY;
-Styles = ();
-Dir = PD_PROGDIR;
-Name = Applications;
-Target = /Applications;
-End
-#endif
-
-Directory gid_Dir_Addin
-Styles = (CREATE);
-ParentID = gid_Brand_Dir_Program;
-DosName = addin;
-End
-
Directory gid_Dir_Wizards
Styles = (CREATE);
ParentID = gid_Brand_Dir_Program;
@@ -95,30 +79,6 @@
Styles = (CREATE);
ParentID = gid_Dir_Wizards;
DosName = ui;
-End
-
-Directory gid_Dir_Wizards_Ui_Event
-Styles = (CREATE);
-ParentID = gid_Dir_Wizards_Ui;
-DosName = event;
-End
-
-Directory gid_Dir_Wizards_Fax
-Styles = (CREATE);
-ParentID = gid_Dir_Wizards;
-DosName = fax;
-End
-
-Directory gid_Dir_Wizards_Letter
-Styles = (CREATE);
-ParentID = gid_Dir_Wizards;
-DosName = letter;
-End
-
-Directory gid_Dir_Wizards_Agenda
-Styles = (CREATE);
-ParentID = gid_Dir_Wizards;
-DosName = agenda;
End
Directory gid_Dir_Resource
@@ -149,52 +109,10 @@
DosName = presets;
End
-Directory gid_Dir_User_Autotext
-ParentID = gid_Dir_User;
-DosName = autotext;
-Styles = (WORKSTATION, CREATE);
-End
-
Directory gid_Dir_User_Uno_Packages
ParentID = gid_Dir_User;
DosName = uno_packages;
Styles = (CREATE);
-End
-
-Directory gid_Dir_User_Uno_Packages_Cache
-ParentID = gid_Dir_User_Uno_Packages;
-DosName = cache;
-Styles = (CREATE);
-End
-
-Directory gid_Dir_User_Temp
-ParentID = gid_Dir_User;
-DosName = temp;
-Styles = (WORKSTATION, CREATE);
-End
-
-Directory gid_Dir_User_Autocorr
-ParentID = gid_Dir_User;
-DosName = autocorr;
-Styles = (WORKSTATION, CREATE);
-End
-
-Directory gid_Dir_User_Bookmark
-ParentID = gid_Dir_User;
-DosName = bookmark;
-Styles = (WORKSTATION);
-End
-
-Directory gid_Dir_User_Scripts
-ParentID = gid_Dir_User;
-DosName = Scripts;
-Styles = (WORKSTATION,CREATE);
-End
-
-Directory gid_Dir_Backup
-ParentID = gid_Dir_User;
-DosName = backup;
-Styles = (WORKSTATION, CREATE);
End
Directory gid_Dir_User_Basic
@@ -211,54 +129,6 @@
Directory gid_Dir_User_Config
ParentID = gid_Dir_User;
DosName = config;
-Styles = (WORKSTATION, CREATE);
-End
-
-Directory gid_Dir_User_Config_Sofficecfg
-ParentID = gid_Dir_User_Config;
-DosName = soffice.cfg;
-Styles = (WORKSTATION);
-End
-
-Directory gid_Dir_User_Template
-ParentID = gid_Dir_User;
-DosName = template;
-Styles = (WORKSTATION, CREATE);
-End
-
-Directory gid_Dir_Database
-ParentID = gid_Dir_User;
-DosName = database;
-Styles = (WORKSTATION, CREATE);
-End
-
-Directory gid_Dir_Database_Biblio
-ParentID = gid_Dir_Database;
-DosName = biblio;
-Styles = (WORKSTATION, CREATE);
-End
-
-Directory gid_Dir_User_Gallery
-ParentID = gid_Dir_User;
-DosName = gallery;
-Styles = (WORKSTATION, CREATE);
-End
-
-Directory gid_Dir_User_Wordbook
-ParentID = gid_Dir_User;
-DosName = wordbook;
-Styles = (WORKSTATION, CREATE);
-End
-
-Directory gid_Dir_Store
-ParentID = gid_Dir_User;
-DosName = store;
-Styles = (WORKSTATION, CREATE);
-End
-
-Directory gid_Dir_Plugin
-ParentID = gid_Brand_Dir_Program;
-DosName = plugin;
Styles = (WORKSTATION, CREATE);
End
@@ -398,59 +268,9 @@
DosName = soffice.cfg;
End
[PUSHED] fdo#39468 Translate German comments V2 - vcl/source/edit/{te...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3162 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3162 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0f9e8dcda27a714628edaa5e1e8fd875c8f67593 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian M. Heller christian.helle...@gmail.com Gerrit-Reviewer: Philipp Riemer ruderphil...@gmail.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] remove dead class SfxResourceManager
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3393 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3393 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I33590e7907c593d821e2eafda0e04c76c8b99879 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Noel Grandin noelgran...@gmail.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Removal of Dead code
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3392 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3392 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4a8aa2d2f89fd3ee56ac10c2551076a6063d570c Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: gokul s gswaminat...@kacst.edu.sa Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Simple string cleanup in backingwindow.cxx
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3377 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3377 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5bd7152f0dfdc5459e9a754af1e8c65234ff606d Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Olivier Hallot olivier.hal...@edx.srv.br Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] remove dead code
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3361 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3361 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I18b203f9647e2fd5199a2d15f4be67c99f7def5d Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Noel Grandin noelgran...@gmail.com Gerrit-Reviewer: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#39468 Comment translation GER-ENG in sw/source/ui/wrtsh/...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3319 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3319 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7856e383e032a98fb08a1299a77eb41636549a65 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#63350 math: move stardard toolbar to the left
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3323 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/23/3323/1 fdo#63350 math: move stardard toolbar to the left Change-Id: I8f57d46737315caa41f7488e82262067a35f5253 --- M officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu index 5333926..4dee141 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu @@ -43,7 +43,7 @@ /node node oor:name=private:resource/toolbar/toolbar oor:op=replace prop oor:name=DockPos oor:type=xs:string -value0,0/value +value1,0/value /prop prop oor:name=Docked oor:type=xs:boolean valuetrue/value -- To view, visit https://gerrit.libreoffice.org/3323 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8f57d46737315caa41f7488e82262067a35f5253 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] fdo#63350 math: move stardard toolbar to the left
Thomas Arnhold has abandoned this change. Change subject: fdo#63350 math: move stardard toolbar to the left .. Patch Set 1: Abandoned hrm this should be libreoffice-4-0 -- To view, visit https://gerrit.libreoffice.org/3323 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I8f57d46737315caa41f7488e82262067a35f5253 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fdo#63350 math: move stardard toolbar to the left
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3324 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/24/3324/1 fdo#63350 math: move stardard toolbar to the left Change-Id: Ibadd1dff90383fb0a285a9cb94cc0050906e3f24 --- M officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu index 5333926..4dee141 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu @@ -43,7 +43,7 @@ /node node oor:name=private:resource/toolbar/toolbar oor:op=replace prop oor:name=DockPos oor:type=xs:string -value0,0/value +value1,0/value /prop prop oor:name=Docked oor:type=xs:boolean valuetrue/value -- To view, visit https://gerrit.libreoffice.org/3324 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibadd1dff90383fb0a285a9cb94cc0050906e3f24 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#39468: Translated German comments in filter
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3178 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3178 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ife2865d787b32fb821d07a6c0e9173b6235dcd1b Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Hansgerd Schneider hansgerd.schnei...@yahoo.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#39468 Translate German in DBG_ASSERT and OSL_ENSURE in t...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3163 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3163 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9aac6a1f6e4a36fb95a518b752aef2066b45094c Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian M. Heller christian.helle...@gmail.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#62525: use cow_wrapper for ViewInformation2D
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3183
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/83/3183/1
fdo#62525: use cow_wrapper for ViewInformation2D
Change-Id: Ide3bce3257c9fed7bbda7276dfb55fa179d74fdd
---
M drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx
M drawinglayer/source/geometry/viewinformation2d.cxx
2 files changed, 20 insertions(+), 66 deletions(-)
diff --git a/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx
b/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx
index e3d4f23..f8e0d66 100644
--- a/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx
+++ b/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx
@@ -29,6 +29,7 @@
#include com/sun/star/uno/Sequence.h
#include com/sun/star/beans/PropertyValue.hpp
#include com/sun/star/drawing/XDrawPage.hpp
+#include o3tl/cow_wrapper.hxx
//
// predefines
@@ -58,9 +59,12 @@
*/
class DRAWINGLAYER_DLLPUBLIC ViewInformation2D
{
+public:
+typedef o3tl::cow_wrapper ImpViewInformation2D,
o3tl::ThreadSafeRefCountingPolicy ImplType;
+
private:
/// pointer to private implementation class
-ImpViewInformation2D* mpViewInformation2D;
+ImplType mpViewInformation2D;
public:
/** Constructor: Create a ViewInformation2D
diff --git a/drawinglayer/source/geometry/viewinformation2d.cxx
b/drawinglayer/source/geometry/viewinformation2d.cxx
index 6a0b352..69b541d 100644
--- a/drawinglayer/source/geometry/viewinformation2d.cxx
+++ b/drawinglayer/source/geometry/viewinformation2d.cxx
@@ -24,6 +24,7 @@
#include basegfx/tools/canvastools.hxx
#include com/sun/star/geometry/AffineMatrix2D.hpp
#include com/sun/star/geometry/RealRectangle2D.hpp
+#include rtl/instance.hxx
//
@@ -41,9 +42,6 @@
// ViewInformation2D implementation can change refcount, so we
have only
// two memory regions for pairs of
ViewInformation2D/ImpViewInformation2D
friend class ::drawinglayer::geometry::ViewInformation2D;
-
-// the refcounter. 0 means exclusively used
-sal_uInt32 mnRefCount;
protected:
// the object transformation
@@ -261,8 +259,7 @@
const uno::Reference drawing::XDrawPage rxDrawPage,
double fViewTime,
const uno::Sequence beans::PropertyValue
rExtendedParameters)
-: mnRefCount(0),
-maObjectTransformation(rObjectTransformation),
+: maObjectTransformation(rObjectTransformation),
maViewTransformation(rViewTransformation),
maObjectToViewTransformation(),
maInverseObjectToViewTransformation(),
@@ -278,8 +275,7 @@
}
explicit ImpViewInformation2D(const uno::Sequence
beans::PropertyValue rViewParameters)
-: mnRefCount(0),
-maObjectTransformation(),
+: maObjectTransformation(),
maViewTransformation(),
maObjectToViewTransformation(),
maInverseObjectToViewTransformation(),
@@ -295,8 +291,7 @@
}
ImpViewInformation2D()
-: mnRefCount(0),
-maObjectTransformation(),
+: maObjectTransformation(),
maViewTransformation(),
maObjectToViewTransformation(),
maInverseObjectToViewTransformation(),
@@ -407,21 +402,6 @@
mfViewTime == rCandidate.mfViewTime
mxExtendedInformation ==
rCandidate.mxExtendedInformation);
}
-
-static ImpViewInformation2D* get_global_default()
-{
-static ImpViewInformation2D* pDefault = 0;
-
-if(!pDefault)
-{
-pDefault = new ImpViewInformation2D();
-
-// never delete; start with RefCount 1, not 0
-pDefault-mnRefCount++;
-}
-
-return pDefault;
-}
};
} // end of anonymous namespace
} // end of namespace drawinglayer
@@ -432,6 +412,12 @@
{
namespace geometry
{
+namespace
+{
+struct theGlobalDefault :
+public rtl::Static ViewInformation2D::ImplType,
theGlobalDefault {};
+}
+
ViewInformation2D::ViewInformation2D(
const basegfx::B2DHomMatrix rObjectTransformation,
const basegfx::B2DHomMatrix rViewTransformation,
@@ -439,7 +425,7 @@
const uno::Reference drawing::XDrawPage rxDrawPage,
double
[PATCH] fdo#58807 bring Beep() for basic back
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3184
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/84/3184/1
fdo#58807 bring Beep() for basic back
The functionality was removed by fdo#48549.
This partially reverts
0f6101cfef4c2e45d9f1f1b3a61ef94799e4526b
0bdf6fc7c71c4c49e6d6f83d56ac953272ad16d5
85cb9084533605657aca0394afe4516058a8e4ef
I changed the behavior to always beep, because only the basic macro
function is using Beep(). Looks like the Beep macro function didn't
even work correctly before the removal, because the default was to
not beep for most platforms. So I set the volume from disable (0)
to 50% for XBell().
Reviewed-on: https://gerrit.libreoffice.org/3124
Reviewed-by: Thorsten Behrens tbehr...@suse.com
Tested-by: Thorsten Behrens tbehr...@suse.com
Conflicts:
vcl/inc/headless/svpframe.hxx
Change-Id: I176dc5a18b8ceec467946f4544418f502880c611
---
M basic/source/runtime/methods.cxx
M vcl/Library_vcl.mk
M vcl/Package_inc.mk
M vcl/aqua/source/window/salframe.cxx
M vcl/headless/svpframe.cxx
M vcl/inc/aqua/salframe.h
M vcl/inc/headless/svpframe.hxx
M vcl/inc/salframe.hxx
M vcl/inc/unx/gtk/gtkframe.hxx
M vcl/inc/unx/saldisp.hxx
M vcl/inc/unx/salframe.h
A vcl/inc/vcl/sound.hxx
M vcl/inc/win/salframe.h
A vcl/source/app/sound.cxx
M vcl/unx/generic/app/saldisp.cxx
M vcl/unx/generic/window/salframe.cxx
M vcl/unx/gtk/window/gtkframe.cxx
M vcl/win/source/window/salframe.cxx
18 files changed, 132 insertions(+), 3 deletions(-)
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index e09f447..858f844 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -22,6 +22,7 @@
#include osl/process.h
#include vcl/svapp.hxx
#include vcl/settings.hxx
+#include vcl/sound.hxx
#include tools/wintypes.hxx
#include vcl/msgbox.hxx
#include basic/sbx.hxx
@@ -4215,6 +4216,7 @@
StarBASIC::Error( SbERR_BAD_ARGUMENT );
return;
}
+Sound::Beep();
}
RTLFUNC(Load)
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index a05e39b..8f12d2c 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -117,6 +117,7 @@
vcl/source/app/session \
vcl/source/app/settings \
vcl/source/app/solarmutex \
+vcl/source/app/sound \
vcl/source/app/stdtext \
vcl/source/app/svapp \
vcl/source/app/svdata \
diff --git a/vcl/Package_inc.mk b/vcl/Package_inc.mk
index 53a7326..48d996d 100644
--- a/vcl/Package_inc.mk
+++ b/vcl/Package_inc.mk
@@ -126,6 +126,7 @@
$(eval $(call
gb_Package_add_file,vcl_inc,inc/vcl/settings.hxx,vcl/settings.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/slider.hxx,vcl/slider.hxx))
$(eval $(call
gb_Package_add_file,vcl_inc,inc/vcl/solarmutex.hxx,vcl/solarmutex.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/sound.hxx,vcl/sound.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/spinfld.hxx,vcl/spinfld.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/spin.h,vcl/spin.h))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/spin.hxx,vcl/spin.hxx))
diff --git a/vcl/aqua/source/window/salframe.cxx
b/vcl/aqua/source/window/salframe.cxx
index d2e616c..12cbb91 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -1339,6 +1339,13 @@
// ---
+void AquaSalFrame::Beep()
+{
+NSBeep();
+}
+
+// ---
+
void AquaSalFrame::SetPosSize(long nX, long nY, long nWidth, long nHeight,
sal_uInt16 nFlags)
{
if ( !mpWindow )
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 0d4e466..5827d51 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -419,6 +419,10 @@
{
}
+void SvpSalFrame::Beep()
+{
+}
+
const SystemEnvData* SvpSalFrame::GetSystemData() const
{
return m_aSystemChildData;
diff --git a/vcl/inc/aqua/salframe.h b/vcl/inc/aqua/salframe.h
index e6dcde3..39d9496 100644
--- a/vcl/inc/aqua/salframe.h
+++ b/vcl/inc/aqua/salframe.h
@@ -138,6 +138,7 @@
virtual sal_BoolMapUnicodeToKeyCode( sal_Unicode aUnicode,
LanguageType aLangType, KeyCode rKeyCode );
virtual LanguageTypeGetInputLanguage();
virtual voidUpdateSettings( AllSettings rSettings );
+virtual voidBeep();
virtual const SystemEnvData*GetSystemData() const;
virtual SalPointerState GetPointerState();
virtual SalIndicatorState GetIndicatorState();
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index c48d602..887e182 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -102,11 +102,12 @@
virtual voidSync();
virtual voidSetInputContext( SalInputContext* pContext );
virtual voidEndExtTextInput(
[ABANDONED] fdo#58807 bring Beep() for basic back
Thomas Arnhold has abandoned this change. Change subject: fdo#58807 bring Beep() for basic back .. Patch Set 1: Abandoned -- To view, visit https://gerrit.libreoffice.org/3184 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I176dc5a18b8ceec467946f4544418f502880c611 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fdo#58807 bring Beep() for basic back
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3185
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/85/3185/1
fdo#58807 bring Beep() for basic back
The functionality was removed by fdo#48549.
This partially reverts
0f6101cfef4c2e45d9f1f1b3a61ef94799e4526b
0bdf6fc7c71c4c49e6d6f83d56ac953272ad16d5
85cb9084533605657aca0394afe4516058a8e4ef
I changed the behavior to always beep, because only the basic macro
function is using Beep(). Looks like the Beep macro function didn't
even work correctly before the removal, because the default was to
not beep for most platforms. So I set the volume from disable (0)
to 50% for XBell().
Reviewed-on: https://gerrit.libreoffice.org/3124
Reviewed-by: Thorsten Behrens tbehr...@suse.com
Tested-by: Thorsten Behrens tbehr...@suse.com
(cherry picked from commit 47664d3f2e12649d324b031ca6ffd5589fe3d197)
Conflicts:
vcl/inc/headless/svpframe.hxx
Change-Id: I663ffb7af75d2fd6d2c1f94073e4412d9744de4a
---
M basic/source/runtime/methods.cxx
M vcl/Library_vcl.mk
M vcl/Package_inc.mk
M vcl/aqua/source/window/salframe.cxx
M vcl/headless/svpframe.cxx
M vcl/inc/aqua/salframe.h
M vcl/inc/headless/svpframe.hxx
M vcl/inc/salframe.hxx
M vcl/inc/unx/gtk/gtkframe.hxx
M vcl/inc/unx/saldisp.hxx
M vcl/inc/unx/salframe.h
A vcl/inc/vcl/sound.hxx
M vcl/inc/win/salframe.h
A vcl/source/app/sound.cxx
M vcl/unx/generic/app/saldisp.cxx
M vcl/unx/generic/window/salframe.cxx
M vcl/unx/gtk/window/gtkframe.cxx
M vcl/win/source/window/salframe.cxx
18 files changed, 132 insertions(+), 3 deletions(-)
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index e09f447..858f844 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -22,6 +22,7 @@
#include osl/process.h
#include vcl/svapp.hxx
#include vcl/settings.hxx
+#include vcl/sound.hxx
#include tools/wintypes.hxx
#include vcl/msgbox.hxx
#include basic/sbx.hxx
@@ -4215,6 +4216,7 @@
StarBASIC::Error( SbERR_BAD_ARGUMENT );
return;
}
+Sound::Beep();
}
RTLFUNC(Load)
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index a05e39b..8f12d2c 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -117,6 +117,7 @@
vcl/source/app/session \
vcl/source/app/settings \
vcl/source/app/solarmutex \
+vcl/source/app/sound \
vcl/source/app/stdtext \
vcl/source/app/svapp \
vcl/source/app/svdata \
diff --git a/vcl/Package_inc.mk b/vcl/Package_inc.mk
index 53a7326..48d996d 100644
--- a/vcl/Package_inc.mk
+++ b/vcl/Package_inc.mk
@@ -126,6 +126,7 @@
$(eval $(call
gb_Package_add_file,vcl_inc,inc/vcl/settings.hxx,vcl/settings.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/slider.hxx,vcl/slider.hxx))
$(eval $(call
gb_Package_add_file,vcl_inc,inc/vcl/solarmutex.hxx,vcl/solarmutex.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/sound.hxx,vcl/sound.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/spinfld.hxx,vcl/spinfld.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/spin.h,vcl/spin.h))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/spin.hxx,vcl/spin.hxx))
diff --git a/vcl/aqua/source/window/salframe.cxx
b/vcl/aqua/source/window/salframe.cxx
index d2e616c..12cbb91 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -1339,6 +1339,13 @@
// ---
+void AquaSalFrame::Beep()
+{
+NSBeep();
+}
+
+// ---
+
void AquaSalFrame::SetPosSize(long nX, long nY, long nWidth, long nHeight,
sal_uInt16 nFlags)
{
if ( !mpWindow )
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 0d4e466..5827d51 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -419,6 +419,10 @@
{
}
+void SvpSalFrame::Beep()
+{
+}
+
const SystemEnvData* SvpSalFrame::GetSystemData() const
{
return m_aSystemChildData;
diff --git a/vcl/inc/aqua/salframe.h b/vcl/inc/aqua/salframe.h
index e6dcde3..39d9496 100644
--- a/vcl/inc/aqua/salframe.h
+++ b/vcl/inc/aqua/salframe.h
@@ -138,6 +138,7 @@
virtual sal_BoolMapUnicodeToKeyCode( sal_Unicode aUnicode,
LanguageType aLangType, KeyCode rKeyCode );
virtual LanguageTypeGetInputLanguage();
virtual voidUpdateSettings( AllSettings rSettings );
+virtual voidBeep();
virtual const SystemEnvData*GetSystemData() const;
virtual SalPointerState GetPointerState();
virtual SalIndicatorState GetIndicatorState();
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index c48d602..887e182 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -102,11 +102,12 @@
virtual voidSync();
virtual voidSetInputContext(
[PUSHED libreoffice-4-0] Keep semantics, but improve readibility.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3186 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3186 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I32c18cb7b080f4847118a2d7e8d77dcd2bbce308 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Jan Holesovsky ke...@suse.cz Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] unotools: remove some unused items
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3191 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/91/3191/1 unotools: remove some unused items Change-Id: I95bcac6a3ff8cf4644c9d1596c75cac2d9cd94fe --- M officecfg/registry/schema/org/openoffice/Office/Common.xcs M sfx2/source/appl/app.cxx M unotools/Library_utl.mk M unotools/Package_inc.mk D unotools/inc/unotools/accelcfg.hxx M unotools/inc/unotools/itemholderbase.hxx D unotools/inc/unotools/workingsetoptions.hxx M unotools/inc/unotools/xmlaccelcfg.hxx D unotools/source/config/accelcfg.cxx M unotools/source/config/itemholder1.cxx D unotools/source/config/workingsetoptions.cxx 11 files changed, 11 insertions(+), 740 deletions(-) diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 66e353c..f819ebe 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -3694,21 +3694,6 @@ /group /group /group -group oor:name=WorkingSet - info -deprecated/ -descLists open documents or windows./desc - /info - prop oor:name=WindowList oor:type=oor:string-list -!-- OldPath: SavedWorkingSet -- -!-- OldLocation: soffice.ini -- -!-- UIHints: Tools Options - General Save -- -info - deprecated/ - descLists open documents or windows./desc -/info - /prop -/group group oor:name=AddXMLToStorage info descContains settings specifying if a XML package is added to the diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 479f9d4..3b31dbd 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -113,7 +113,6 @@ #include unotools/securityoptions.hxx #include unotools/localisationoptions.hxx #include unotools/fontoptions.hxx -#include unotools/workingsetoptions.hxx #include unotools/syslocaleoptions.hxx #include unotools/syslocale.hxx #include framework/addonsoptions.hxx diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk index d99c18b..dcef7a8 100644 --- a/unotools/Library_utl.mk +++ b/unotools/Library_utl.mk @@ -71,7 +71,6 @@ $(eval $(call gb_Library_add_exception_objects,utl,\ unotools/source/accessibility/accessiblerelationsethelper \ unotools/source/accessibility/accessiblestatesethelper \ -unotools/source/config/accelcfg \ unotools/source/config/bootstrap \ unotools/source/config/cmdoptions \ unotools/source/config/compatibility \ @@ -104,7 +103,6 @@ unotools/source/config/syslocaleoptions \ unotools/source/config/useroptions \ unotools/source/config/viewoptions \ -unotools/source/config/workingsetoptions \ unotools/source/config/xmlaccelcfg \ unotools/source/i18n/calendarwrapper \ unotools/source/i18n/caserotate \ diff --git a/unotools/Package_inc.mk b/unotools/Package_inc.mk index 92ec12e..1a47ec1 100644 --- a/unotools/Package_inc.mk +++ b/unotools/Package_inc.mk @@ -27,7 +27,6 @@ $(eval $(call gb_Package_Package,unotools_inc,$(SRCDIR)/unotools/inc)) -$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/accelcfg.hxx,unotools/accelcfg.hxx)) $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/accessiblerelationsethelper.hxx,unotools/accessiblerelationsethelper.hxx)) $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/accessiblestatesethelper.hxx,unotools/accessiblestatesethelper.hxx)) $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/atom.hxx,unotools/atom.hxx)) @@ -96,7 +95,6 @@ $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/unotoolsdllapi.h,unotools/unotoolsdllapi.h)) $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/useroptions.hxx,unotools/useroptions.hxx)) $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/viewoptions.hxx,unotools/viewoptions.hxx)) -$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/workingsetoptions.hxx,unotools/workingsetoptions.hxx)) $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/xmlaccelcfg.hxx,unotools/xmlaccelcfg.hxx)) # vim: set noet sw=4 ts=4: diff --git a/unotools/inc/unotools/accelcfg.hxx b/unotools/inc/unotools/accelcfg.hxx deleted file mode 100644 index c60a4f0..000 --- a/unotools/inc/unotools/accelcfg.hxx +++ /dev/null @@ -1,65 +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 - *
[PUSHED] fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3179 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3179 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I20f539bd9fa62bef2e9a2a82b59e0b15f4efdd48 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ioan Radu ioan.rad...@gmail.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Revert Revert reduce some uglyness
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3171
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/71/3171/1
Revert Revert reduce some uglyness
The header guard seems to solve the problem.
This reverts commit df8c41cceeca27ae49e9fa6b5cd64c65c8feb218.
Change-Id: I27869be9c70e79a366a547ce061e71a3743f87da
---
M svl/inc/svl/rngitem.hxx
M svl/source/items/rngitem.cxx
D svl/source/items/rngitem_inc.cxx
3 files changed, 198 insertions(+), 255 deletions(-)
diff --git a/svl/inc/svl/rngitem.hxx b/svl/inc/svl/rngitem.hxx
index 698641d..450e958 100644
--- a/svl/inc/svl/rngitem.hxx
+++ b/svl/inc/svl/rngitem.hxx
@@ -18,20 +18,8 @@
*/
#ifndef _SFXRNGITEM_HXX
-
-#ifndef NUMTYPE
-
-#define NUMTYPE sal_uInt16
-#define SfxXRangeItem SfxRangeItem
-#define SfxXRangesItem SfxUShortRangesItem
-#include svl/rngitem.hxx
-#undef NUMTYPE
-#undef SfxXRangeItem
-#undef SfxXRangesItem
-
#define _SFXRNGITEM_HXX
-#else
#include svl/svldllapi.h
#include svl/poolitem.hxx
@@ -39,16 +27,16 @@
// ---
-class SVL_DLLPUBLIC SfxXRangeItem : public SfxPoolItem
+class SVL_DLLPUBLIC SfxRangeItem : public SfxPoolItem
{
private:
-NUMTYPE nFrom;
-NUMTYPE nTo;
+sal_uInt16 nFrom;
+sal_uInt16 nTo;
public:
TYPEINFO();
-SfxXRangeItem();
-SfxXRangeItem( sal_uInt16 nWID, NUMTYPE nFrom,
NUMTYPE nTo );
-SfxXRangeItem( const SfxXRangeItem rItem );
+SfxRangeItem();
+SfxRangeItem( sal_uInt16 nWID, sal_uInt16
nFrom, sal_uInt16 nTo );
+SfxRangeItem( const SfxRangeItem rItem );
virtual int operator==( const SfxPoolItem ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
@@ -56,28 +44,28 @@
OUString rText,
const IntlWrapper * = 0 ) const;
virtual SfxPoolItem*Clone( SfxItemPool *pPool = 0 ) const;
-inline NUMTYPE From() { return nFrom; }
-inline NUMTYPE From() const { return nFrom; }
-inline NUMTYPE To() { return nTo; }
-inline NUMTYPE To() const { return nTo; }
-inline sal_Bool HasRange() const { return nTonFrom; }
+inline sal_uInt16 From() { return nFrom; }
+inline sal_uInt16 From() const { return nFrom; }
+inline sal_uInt16 To() { return nTo; }
+inline sal_uInt16 To() const { return nTo; }
+inline sal_Bool HasRange() const { return nTonFrom; }
virtual SfxPoolItem*Create( SvStream , sal_uInt16 nVersion )
const;
virtual SvStream Store( SvStream , sal_uInt16 nItemVersion )
const;
};
// ---
-class SVL_DLLPUBLIC SfxXRangesItem : public SfxPoolItem
+class SVL_DLLPUBLIC SfxUShortRangesItem : public SfxPoolItem
{
private:
-NUMTYPE*_pRanges;
+sal_uInt16* _pRanges;
public:
TYPEINFO();
-SfxXRangesItem();
-SfxXRangesItem( sal_uInt16 nWID, SvStream
rStream );
-SfxXRangesItem( const SfxXRangesItem rItem );
-virtual ~SfxXRangesItem();
+SfxUShortRangesItem();
+SfxUShortRangesItem( sal_uInt16 nWID, SvStream
rStream );
+SfxUShortRangesItem( const
SfxUShortRangesItem rItem );
+virtual ~SfxUShortRangesItem();
virtual int operator==( const SfxPoolItem ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
@@ -85,12 +73,11 @@
OUString rText,
const IntlWrapper * = 0 ) const;
virtual SfxPoolItem*Clone( SfxItemPool *pPool = 0 ) const;
-inline const NUMTYPE* GetRanges() const { return _pRanges; }
+inline const sal_uInt16*GetRanges() const { return _pRanges; }
virtual SfxPoolItem*Create( SvStream , sal_uInt16 nVersion )
const;
virtual SvStream Store( SvStream , sal_uInt16 nItemVersion )
const;
};
-#endif
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/source/items/rngitem.cxx b/svl/source/items/rngitem.cxx
index 72f890d..645c543 100644
---
[PUSHED] vcl: convert some fprintf to SAL_INFO
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3143 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3143 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4b9a20e62e8e137a1bfaa1c654307f15c33e3d3c Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Thomas Arnhold tho...@arnhold.org Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] API CHANGE: drop rtl::O[U]StringBuffer::{charAt, setCharAt}
Thomas Arnhold has abandoned this change.
Change subject: API CHANGE: drop rtl::O[U]StringBuffer::{charAt,setCharAt}
..
Patch Set 1: Abandoned
--
To view, visit https://gerrit.libreoffice.org/3155
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: abandon
Gerrit-Change-Id: Ief3a418e2ab0039bdf5100ec6e1505a4887487e7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Thomas Arnhold tho...@arnhold.org
Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz
Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Remove RTL_CONSTASCII_(U)STRINGPARAM in bridges
Hello LibreOffice gerrit bot, Luboš Luňák, I'd like you to reexamine a rebased change. Please visit https://gerrit.libreoffice.org/3139 to look at the new rebased patch set (#2). Change subject: Remove RTL_CONSTASCII_(U)STRINGPARAM in bridges .. Remove RTL_CONSTASCII_(U)STRINGPARAM in bridges Change-Id: Id8777ee7f587846399e95cf3b1b37d669a76bae5 --- M bridges/inc/bridges/cpp_uno/bridge.hxx M bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx M bridges/source/cpp_uno/gcc3_ios_arm/except.cxx M bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx M bridges/source/cpp_uno/gcc3_linux_arm/except.cxx M bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx M bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx M bridges/source/cpp_uno/gcc3_linux_intel/except.cxx M bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx M bridges/source/cpp_uno/gcc3_linux_mips/except.cxx M bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx M bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx M bridges/source/cpp_uno/gcc3_linux_s390/except.cxx M bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx M bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx M bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx M bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx M bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx M bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx M bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx M bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx M bridges/source/cpp_uno/mingw_intel/except.cxx M bridges/source/cpp_uno/msvc_win32_intel/except.cxx M bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx M bridges/source/cpp_uno/shared/component.cxx M bridges/source/jni_uno/jni_data.cxx M bridges/source/jni_uno/jni_info.cxx M bridges/source/jni_uno/jni_info.h M bridges/source/jni_uno/jni_java2uno.cxx M bridges/source/jni_uno/jni_uno2java.cxx M bridges/test/java_uno/any/transport.cxx M bridges/test/testclient.cxx M bridges/test/testoffice.cxx M bridges/test/testsameprocess.cxx M bridges/test/testserver.cxx 37 files changed, 127 insertions(+), 161 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/39/3139/2 -- To view, visit https://gerrit.libreoffice.org/3139 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id8777ee7f587846399e95cf3b1b37d669a76bae5 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christina Roßmanith chrrossman...@web.de Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Remove SvtInternalOptions
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3180
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/80/3180/1
Remove SvtInternalOptions
* only Get/SetCurrentTempURL were used, but only for compatibility reasons,
to remove old temporary directories (before 2001). Those should be gone
today.
* MailUIEnabled was false in the xcu file.
* SID_MAIL_SENDDOC* are handled some lines further.
Change-Id: I482719b0de9df0a77c2fef0bf25ae1fb68926375
---
M dbaccess/inc/pch/precompiled_dbu.hxx
M dbaccess/source/ui/app/AppController.cxx
M desktop/source/app/app.cxx
M desktop/source/app/appinit.cxx
M framework/source/services/sessionlistener.cxx
M officecfg/registry/schema/org/openoffice/Office/Common.xcs
M sfx2/inc/sfx2/sfxsids.hrc
M sfx2/sdi/frmslots.sdi
M sfx2/sdi/sfx.sdi
M sfx2/source/appl/app.cxx
M sfx2/source/appl/appmisc.cxx
M sfx2/source/view/viewsh.cxx
M unotools/Library_utl.mk
M unotools/Package_inc.mk
D unotools/inc/unotools/internaloptions.hxx
M unotools/inc/unotools/itemholderbase.hxx
D unotools/source/config/internaloptions.cxx
M unotools/source/config/itemholder1.cxx
18 files changed, 2 insertions(+), 610 deletions(-)
diff --git a/dbaccess/inc/pch/precompiled_dbu.hxx
b/dbaccess/inc/pch/precompiled_dbu.hxx
index 4983860..7c082ad 100644
--- a/dbaccess/inc/pch/precompiled_dbu.hxx
+++ b/dbaccess/inc/pch/precompiled_dbu.hxx
@@ -449,7 +449,6 @@
#include unotools/configmgr.hxx
#include unotools/confignode.hxx
#include unotools/historyoptions.hxx
-#include unotools/internaloptions.hxx
#include unotools/localfilehelper.hxx
#include unotools/moduleoptions.hxx
#include unotools/pathoptions.hxx
diff --git a/dbaccess/source/ui/app/AppController.cxx
b/dbaccess/source/ui/app/AppController.cxx
index 0c9ca0e..53b6555 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -89,7 +89,6 @@
#include unotools/closeveto.hxx
#include unotools/pathoptions.hxx
#include unotools/tempfile.hxx
-#include unotools/internaloptions.hxx
#include unotools/moduleoptions.hxx
#include unotools/historyoptions.hxx
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 3eb4ab1..2ae404e 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -83,7 +83,6 @@
#include osl/process.h
#include rtl/uri.hxx
#include unotools/pathoptions.hxx
-#include unotools/internaloptions.hxx
#include svtools/miscopt.hxx
#include svtools/menuoptions.hxx
#include svl/folderrestriction.hxx
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index d16cdcc..c8d78cb 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -54,7 +54,6 @@
#include unotools/tempfile.hxx
#include vcl/svapp.hxx
#include unotools/pathoptions.hxx
-#include unotools/internaloptions.hxx
using namespace desktop;
@@ -277,20 +276,10 @@
throw;
}
-// remove possible old directory and base directory
-SvtInternalOptions aInternalOpt;
-
// set temp base directory
sal_Int32 nLength = aTempBaseURL.getLength();
if ( aTempBaseURL.matchAsciiL( /, 1, nLength-1 ) )
aTempBaseURL = aTempBaseURL.copy( 0, nLength - 1 );
-
-String aOldTempURL = aInternalOpt.GetCurrentTempURL();
-if ( aOldTempURL.Len() 0 )
-{
-// remove old temporary directory
-::utl::UCBContentHelper::Kill( aOldTempURL );
-}
::rtl::OUString aRet;
::rtl::OUString aTempPath( aTempBaseURL );
@@ -314,7 +303,6 @@
// set new current temporary directory
::utl::LocalFileHelper::ConvertPhysicalNameToURL( aTempPath, aRet );
-aInternalOpt.SetCurrentTempURL( aRet );
CurrentTempURL::get() = aRet;
}
@@ -326,8 +314,7 @@
String rCurrentTempURL = CurrentTempURL::get();
if ( rCurrentTempURL.Len() 0 )
{
-if ( ::utl::UCBContentHelper::Kill( rCurrentTempURL ) )
-SvtInternalOptions().SetCurrentTempURL( String() );
+::utl::UCBContentHelper::Kill( rCurrentTempURL );
}
}
diff --git a/framework/source/services/sessionlistener.cxx
b/framework/source/services/sessionlistener.cxx
index 1a88f56..df93834 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -50,7 +50,6 @@
#include osl/time.h
#include comphelper/processfactory.hxx
#include unotools/pathoptions.hxx
-#include unotools/internaloptions.hxx
#include stdio.h
#include com/sun/star/uno/Any.hxx
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index c997371..66e353c 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -2299,32 +2299,6 @@
descContains settings which are used during the Office startup to
check for unfinished work./desc
/info
- prop
[PUSHED] Comment translation GER-ENG in sw/source/ui/utlui/ (Part 3)
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3144 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3144 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I33a96565553a78e30f4d6af0b4b92371188d053e Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] API CHANGE: drop rtl::O[U]StringBuffer::{charAt,setCharAt}
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3155
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/55/3155/1
API CHANGE: drop rtl::O[U]StringBuffer::{charAt,setCharAt}
As a follow up of fdo#41474. See:
https://wiki.documentfoundation.org/Development/LibreOffice4
Change-Id: Ief3a418e2ab0039bdf5100ec6e1505a4887487e7
---
M sal/inc/rtl/strbuf.hxx
M sal/inc/rtl/ustrbuf.hxx
2 files changed, 0 insertions(+), 76 deletions(-)
diff --git a/sal/inc/rtl/strbuf.hxx b/sal/inc/rtl/strbuf.hxx
index 4dabc76..be8b0b1 100644
--- a/sal/inc/rtl/strbuf.hxx
+++ b/sal/inc/rtl/strbuf.hxx
@@ -366,44 +366,6 @@
}
/**
-Returns the character at a specific index in this string buffer.
-
-The first character of a string buffer is at index
-code0/code, the next at index code1/code, and so on, for
-array indexing.
-p
-The index argument must be greater than or equal to
-code0/code, and less than the length of this string buffer.
-
-@param index the index of the desired character.
-@return the character at the specified index of this string buffer.
-*/
-SAL_DEPRECATED(use rtl::OStringBuffer::operator [] instead)
-sal_Char charAt( sal_Int32 index )
-{
-assert(index = 0 index pData-length);
-return pData-buffer[ index ];
-}
-
-/**
-The character at the specified index of this string buffer is set
-to codech/code.
-
-The index argument must be greater than or equal to
-code0/code, and less than the length of this string buffer.
-
-@param index the index of the character to modify.
-@param ch the new character.
- */
-SAL_DEPRECATED(use rtl::OStringBuffer::operator [] instead)
-OStringBuffer setCharAt(sal_Int32 index, sal_Char ch)
-{
-assert(index = 0 index pData-length);
-pData-buffer[ index ] = ch;
-return *this;
-}
-
-/**
Return a null terminated character array.
*/
const sal_Char* getStr() const { return pData-buffer; }
diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx
index 95993fc..b5a1db5 100644
--- a/sal/inc/rtl/ustrbuf.hxx
+++ b/sal/inc/rtl/ustrbuf.hxx
@@ -358,44 +358,6 @@
}
/**
-Returns the character at a specific index in this string buffer.
-
-The first character of a string buffer is at index
-code0/code, the next at index code1/code, and so on, for
-array indexing.
-p
-The index argument must be greater than or equal to
-code0/code, and less than the length of this string buffer.
-
-@param index the index of the desired character.
-@return the character at the specified index of this string buffer.
- */
-SAL_DEPRECATED(use rtl::OUStringBuffer::operator [] instead)
-sal_Unicode charAt( sal_Int32 index ) const
-{
-assert(index = 0 index pData-length);
-return pData-buffer[ index ];
-}
-
-/**
-The character at the specified index of this string buffer is set
-to codech/code.
-
-The index argument must be greater than or equal to
-code0/code, and less than the length of this string buffer.
-
-@param index the index of the character to modify.
-@param ch the new character.
- */
-SAL_DEPRECATED(use rtl::OUStringBuffer::operator [] instead)
-OUStringBuffer setCharAt(sal_Int32 index, sal_Unicode ch)
-{
-assert(index = 0 index pData-length);
-pData-buffer[ index ] = ch;
-return *this;
-}
-
-/**
Return a null terminated unicode character array.
*/
const sal_Unicode* getStr() const { return pData-buffer; }
--
To view, visit https://gerrit.libreoffice.org/3155
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief3a418e2ab0039bdf5100ec6e1505a4887487e7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Thomas Arnhold tho...@arnhold.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Multiple typo fixes, small code changes
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3135 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3135 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id8b29c4051c7c09a1cc555996f9e56fd4f0f3611 Gerrit-PatchSet: 5 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Chris Sherlock chris.sherloc...@gmail.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#62096 Replace O(U)String compareTo with ==
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3136 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3136 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id89b7eeb09b5cd7cee449cd1a20fb13b630f29c4 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Efe Gürkan Yalaman efeyala...@gmail.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Remove commented code in component.cxx (odk)
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3137 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3137 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I559b91d465ab298b033b0866b3044a17038cc501 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christina Roßmanith chrrossman...@web.de Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Comment translation GER-ENG in sw/source/ui/utlui/ PART2
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3129 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3129 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If636f0de7d883412e36c76fe0de997204021d45b Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Remove commented code in odk/examples
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3138 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3138 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8b28729d3cc632426efac02028f0d0e332243012 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christina Roßmanith chrrossman...@web.de Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] vcl: convert some fprintf to SAL_INFO
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3143
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/43/3143/1
vcl: convert some fprintf to SAL_INFO
Change-Id: I4b9a20e62e8e137a1bfaa1c654307f15c33e3d3c
---
M sal/inc/sal/log-areas.dox
M vcl/unx/gtk/app/gtkdata.cxx
M vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
M vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
M vcl/unx/kde/kdedata.cxx
M vcl/unx/kde/salnativewidgets-kde.cxx
M vcl/unx/kde4/KDESalFrame.cxx
M vcl/unx/kde4/KDEXLib.cxx
M vcl/unx/kde4/main.cxx
9 files changed, 27 insertions(+), 53 deletions(-)
diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox
index 05c0f97..c36c742 100644
--- a/sal/inc/sal/log-areas.dox
+++ b/sal/inc/sal/log-areas.dox
@@ -260,6 +260,8 @@
@li @c vcl.gdi - the GDI part of VCL, devices, bitmaps, etc.
@li @c vcl.gtk - Gtk+ 2/3 plugin
@li @c vcl.headless - bitmap-based backend
+@li @c vcl.kde - KDE
+@li @c vcl.kde4 - KDE4
@li @c vcl.layout - Widget layout
@li @c vcl.scrollbar - Scroll Bars
@li @c vcl.sm - Session Manager
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index 36b0ec8..d8ef5ca 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -217,15 +217,12 @@
{
pDefCol = gdk_x11_colormap_foreign_new( pVis,
pSD-m_aColormap.GetXColormap() );
gdk_screen_set_default_colormap( pScreen, pDefCol );
- #if OSL_DEBUG_LEVEL 1
- fprintf( stderr, set new gdk color map for screen %d\n,
nXScreen.getXScreen() );
- #endif
+ SAL_INFO( vcl.gtk, set new gdk color map for screen
nXScreen.getXScreen() );
}
}
-#if OSL_DEBUG_LEVEL 1
else
-fprintf( stderr, not GdkVisual for visual id %d\n,
(int)pSD-m_aVisual.visualid );
-#endif
+SAL_INFO( vcl.gtk, not GdkVisual for visual id
pSD-m_aVisual.visualid );
+
return pSD;
}
@@ -463,7 +460,7 @@
MAKE_CURSOR( POINTER_PAINTBRUSH, paintbrush_ );
default:
-fprintf( stderr, pointer %d not implemented, ePointerStyle );
+SAL_INFO( vcl.gtk, pointer ePointerStyle not
implemented );
break;
}
if( !pCursor )
@@ -609,9 +606,7 @@
void GtkData::Init()
{
int i;
-#if OSL_DEBUG_LEVEL 1
-fprintf( stderr, GtkMainloop::Init()\n );
-#endif
+SAL_INFO( vcl.gtk, GtkMainloop::Init() );
XrmInitialize();
#if !GTK_CHECK_VERSION(3,0,0)
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 3558993..eebfe68 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -1820,10 +1820,7 @@
if( !g_ascii_strcasecmp( pFilter, pExtn ) )
bRetval = sal_True;
-#if OSL_DEBUG_LEVEL 1
-fprintf( stderr, '%s' match extn '%s' vs '%s' yeilds %d\n,
-filter_info-uri, pExtn, pFilter, bRetval );
-#endif
+SAL_INFO( vcl.gtk, ' filter_info-uri ' match extn ' pExtn
' vs ' pFilter ' yeilds bRetval );
return bRetval;
}
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 3f870ce..0d8cf4d 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -623,7 +623,7 @@
{
if ( !pSpinVal )
{
-fprintf( stderr, Tried to draw CTRL_SPINBUTTONS, but the
SpinButtons data structure didn't exist!\n );
+SAL_INFO( vcl.gtk, Tried to draw CTRL_SPINBUTTONS, but the
SpinButtons data structure didn't exist! );
return;
}
areaRect = pSpinVal-maUpperRect;
diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx
index 4eb00ff..07706b2 100644
--- a/vcl/unx/kde/kdedata.cxx
+++ b/vcl/unx/kde/kdedata.cxx
@@ -179,9 +179,7 @@
{
KStartupInfo::appStarted();
m_bStartupDone = true;
-#if OSL_DEBUG_LEVEL 1
-fprintf( stderr, called KStartupInfo::appStarted()\n );
-#endif
+SAL_INFO( vcl.kde, called KStartupInfo::appStarted() );
}
}
@@ -217,9 +215,8 @@
XInitThreads();
rtl::OString aVersion( qVersion() );
-#if OSL_DEBUG_LEVEL 1
-fprintf( stderr, qt version string is \%s\\n, aVersion.getStr() );
-#endif
+SAL_INFO( vcl.kde, qt version string is \ aVersion \ );
+
sal_Int32 nIndex = 0, nMajor = 0, nMinor = 0, nMicro = 0;
nMajor = aVersion.getToken( 0, '.', nIndex ).toInt32();
if( nIndex 0 )
@@ -228,16 +225,12 @@
nMicro = aVersion.getToken( 0, '.', nIndex ).toInt32();
if( nMajor != 3 || nMinor 2 || (nMinor == 2 nMicro 2) )
{
-#if OSL_DEBUG_LEVEL 1
-fprintf( stderr, unsuitable qt version %d.%d.%d\n, (int)nMajor,
(int)nMinor, (int)nMicro );
-#endif
+SAL_INFO( vcl.kde, unsuitable qt version nMajor .
nMinor .
[PATCH] fdo#58807 bring Beep() for basic back
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3124
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/24/3124/1
fdo#58807 bring Beep() for basic back
The functionality was removed by fdo#48549.
This partially reverts
0f6101cfef4c2e45d9f1f1b3a61ef94799e4526b
0bdf6fc7c71c4c49e6d6f83d56ac953272ad16d5
85cb9084533605657aca0394afe4516058a8e4ef
I changed the behavior to always beep, because only the basic macro
function is using Beep(). Looks like the Beep macro function didn't
even work correctly before the removal, because the default was to
not beep for most platforms. So I set the volume from disable (0)
to 50% for XBell().
Change-Id: I663ffb7af75d2fd6d2c1f94073e4412d9744de4a
---
M basic/source/runtime/methods.cxx
M vcl/Library_vcl.mk
M vcl/Package_inc.mk
M vcl/aqua/source/window/salframe.cxx
M vcl/headless/svpframe.cxx
M vcl/inc/aqua/salframe.h
M vcl/inc/headless/svpframe.hxx
M vcl/inc/salframe.hxx
M vcl/inc/unx/gtk/gtkframe.hxx
M vcl/inc/unx/saldisp.hxx
M vcl/inc/unx/salframe.h
M vcl/inc/win/salframe.h
M vcl/unx/generic/app/saldisp.cxx
M vcl/unx/generic/window/salframe.cxx
M vcl/unx/gtk/window/gtkframe.cxx
M vcl/win/source/window/salframe.cxx
16 files changed, 50 insertions(+), 0 deletions(-)
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 211618a..f368ee2 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -22,6 +22,7 @@
#include osl/process.h
#include vcl/svapp.hxx
#include vcl/settings.hxx
+#include vcl/sound.hxx
#include tools/wintypes.hxx
#include vcl/msgbox.hxx
#include basic/sbx.hxx
@@ -4226,6 +4227,7 @@
StarBASIC::Error( SbERR_BAD_ARGUMENT );
return;
}
+Sound::Beep();
}
RTLFUNC(Load)
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 64456e1..c72f6a9 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -121,6 +121,7 @@
vcl/source/app/session \
vcl/source/app/settings \
vcl/source/app/solarmutex \
+vcl/source/app/sound \
vcl/source/app/stdtext \
vcl/source/app/svapp \
vcl/source/app/svdata \
diff --git a/vcl/Package_inc.mk b/vcl/Package_inc.mk
index 1ddefa6..08be3a2 100644
--- a/vcl/Package_inc.mk
+++ b/vcl/Package_inc.mk
@@ -126,6 +126,7 @@
$(eval $(call
gb_Package_add_file,vcl_inc,inc/vcl/settings.hxx,vcl/settings.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/slider.hxx,vcl/slider.hxx))
$(eval $(call
gb_Package_add_file,vcl_inc,inc/vcl/solarmutex.hxx,vcl/solarmutex.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/sound.hxx,vcl/sound.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/spinfld.hxx,vcl/spinfld.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/spin.h,vcl/spin.h))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/spin.hxx,vcl/spin.hxx))
diff --git a/vcl/aqua/source/window/salframe.cxx
b/vcl/aqua/source/window/salframe.cxx
index 854b88c..1d03c30 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -1343,6 +1343,13 @@
// ---
+void AquaSalFrame::Beep()
+{
+NSBeep();
+}
+
+// ---
+
void AquaSalFrame::SetPosSize(long nX, long nY, long nWidth, long nHeight,
sal_uInt16 nFlags)
{
if ( !mpWindow )
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index bf679d9..41f4629 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -419,6 +419,10 @@
{
}
+void SvpSalFrame::Beep()
+{
+}
+
const SystemEnvData* SvpSalFrame::GetSystemData() const
{
return m_aSystemChildData;
diff --git a/vcl/inc/aqua/salframe.h b/vcl/inc/aqua/salframe.h
index e6dcde3..39d9496 100644
--- a/vcl/inc/aqua/salframe.h
+++ b/vcl/inc/aqua/salframe.h
@@ -138,6 +138,7 @@
virtual sal_BoolMapUnicodeToKeyCode( sal_Unicode aUnicode,
LanguageType aLangType, KeyCode rKeyCode );
virtual LanguageTypeGetInputLanguage();
virtual voidUpdateSettings( AllSettings rSettings );
+virtual voidBeep();
virtual const SystemEnvData*GetSystemData() const;
virtual SalPointerState GetPointerState();
virtual SalIndicatorState GetIndicatorState();
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index 4c073d5..342f542 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -106,6 +106,7 @@
virtual sal_BoolMapUnicodeToKeyCode( sal_Unicode aUnicode,
LanguageType aLangType, KeyCode rKeyCode );
virtual LanguageTypeGetInputLanguage();
virtual voidUpdateSettings( AllSettings rSettings );
+virtual voidBeep();
virtual const SystemEnvData* GetSystemData() const;
virtual SalPointerState GetPointerState();
virtual
[PATCH] drawinglayer depends on o3tl_inc
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3125 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/25/3125/1 drawinglayer depends on o3tl_inc Change-Id: I9dab86e62eb34819be1564b3d7be50cf6acb6f73 --- M drawinglayer/Library_drawinglayer.mk 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk index daa522a..1a12fde 100644 --- a/drawinglayer/Library_drawinglayer.mk +++ b/drawinglayer/Library_drawinglayer.mk @@ -27,7 +27,9 @@ $(eval $(call gb_Library_Library,drawinglayer)) -$(eval $(call gb_Library_use_package,drawinglayer,drawinglayer_inc)) +$(eval $(call gb_Library_use_package,drawinglayer,drawinglayer_inc,\ +o3tl_inc \ +)) $(eval $(call gb_Library_set_include,drawinglayer,\ $$(INCLUDE) \ -- To view, visit https://gerrit.libreoffice.org/3125 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9dab86e62eb34819be1564b3d7be50cf6acb6f73 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] drawinglayer depends on o3tl_inc
Thomas Arnhold has abandoned this change. Change subject: drawinglayer depends on o3tl_inc .. Patch Set 1: Abandoned Not needed. Thanks David :) -- To view, visit https://gerrit.libreoffice.org/3125 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I9dab86e62eb34819be1564b3d7be50cf6acb6f73 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Thomas Arnhold tho...@arnhold.org Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] OSL_FAIL - SAL_WARN
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3121
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/21/3121/1
OSL_FAIL - SAL_WARN
Change-Id: I1871e5e3a319b2d5177ae4bd470046c022c14eb7
---
M connectivity/source/commontools/parameters.cxx
M connectivity/source/cpool/ZPoolCollection.cxx
M dbaccess/source/ui/browser/exsrcbrw.cxx
M dbaccess/source/ui/inc/directsql.hxx
M dbaccess/source/ui/misc/UITools.cxx
M extensions/source/dbpilots/gridwizard.cxx
M oox/source/helper/propertyset.cxx
M oox/source/ppt/timenode.cxx
M sal/inc/sal/log-areas.dox
M sc/source/filter/excel/xlroot.cxx
M sdext/source/pdfimport/pdfparse/pdfparse.cxx
M stoc/source/inspect/introspection.cxx
M sw/source/core/access/accmap.cxx
13 files changed, 63 insertions(+), 69 deletions(-)
diff --git a/connectivity/source/commontools/parameters.cxx
b/connectivity/source/commontools/parameters.cxx
index 972e683..5f2a707 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -214,7 +214,7 @@
}
catch( const Exception )
{
-OSL_FAIL( ParameterManager::collectInnerParameters: caught an
exception! );
+SAL_WARN( connectivity.commontools,
ParameterManager::collectInnerParameters: caught an exception! );
}
}
}
@@ -404,7 +404,7 @@
}
catch( const Exception )
{
-OSL_FAIL( ParameterManager::analyzeFieldLinks: caught an
exception! );
+SAL_WARN( connectivity.commontools,
ParameterManager::analyzeFieldLinks: caught an exception! );
}
}
@@ -560,7 +560,7 @@
// does the name denote a valid column in the parent?
if ( !_rxParentColumns-hasByName( *pMasterFields ) )
{
-OSL_FAIL( ParameterManager::fillLinkedParameters: invalid
master names should have been stripped long before! );
+SAL_WARN( connectivity.commontools,
ParameterManager::fillLinkedParameters: invalid master names should have been
stripped long before! );
continue;
}
@@ -570,7 +570,7 @@
|| ( aParamInfo-second.aInnerIndexes.empty() )
)
{
-OSL_FAIL( ParameterManager::fillLinkedParameters: nothing
known about this detail field! );
+SAL_WARN( connectivity.commontools,
ParameterManager::fillLinkedParameters: nothing known about this detail
field! );
continue;
}
@@ -609,9 +609,8 @@
}
catch( const Exception )
{
-OSL_FAIL( ( ::rtl::OString(
ParameterManager::fillLinkedParameters: master-detail parameter number )
-+= ::rtl::OString::valueOf( sal_Int32(
*aPosition + 1 ) )
-+= ::rtl::OString( could not be
filled! ) ).getStr() );
+SAL_WARN( connectivity.commontools,
ParameterManager::fillLinkedParameters: master-detail parameter number
+ sal_Int32( *aPosition + 1 ) could not
be filled! );
}
}
}
@@ -650,7 +649,7 @@
}
catch( const Exception )
{
-OSL_FAIL( ParameterManager::completeParameters: caught an
exception while calling the handler! );
+SAL_WARN( connectivity.commontools,
ParameterManager::completeParameters: caught an exception while calling the
handler! );
}
if ( !pParams-wasSelected() )
@@ -680,7 +679,7 @@
}
catch( const Exception )
{
-OSL_FAIL( ParameterManager::completeParameters: caught an
exception while propagating the values! );
+SAL_WARN( connectivity.commontools,
ParameterManager::completeParameters: caught an exception while propagating
the values! );
}
return true;
}
@@ -751,7 +750,7 @@
}
catch( const Exception )
{
-OSL_FAIL( ParameterManager::getConnection: could not retrieve the
connection of the ! );
+SAL_WARN( connectivity.commontools,
ParameterManager::getConnection: could not retrieve the connection of the ! );
}
return _rxConnection.is();
}
@@ -774,7 +773,7 @@
}
catch( const Exception )
{
-OSL_FAIL( ParameterManager::cacheConnectionInfo: caught an
exception! );
+SAL_WARN( connectivity.commontools,
ParameterManager::cacheConnectionInfo: caught an exception! );
}
}
@@ -830,7 +829,7 @@
}
catch( const Exception )
{
-OSL_FAIL( ParameterManager::getParentColumns: caught an
exception! );
+SAL_WARN(
[PUSHED] Comment translation GER-ENG in sw/source/ui/utlui/ (Part1)
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3101 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3101 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2e216493168e5fea170fa9f0be35919a8c7d2020 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] String::AppendAscii cleanup in dbaccess
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3068 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3068 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6a6d695c9e4b850bc19a3a80c2d8343147724df6 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ricardo Montania rica...@linuxafundo.com.br Gerrit-Reviewer: Christoph Brill egore...@gmail.com Gerrit-Reviewer: Lionel Elie Mamane lio...@mamane.lu Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Cleanup comments and some translations in style.cxx
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3062 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3062 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I18f0a3d9e9c97164691233e3c997f978d339e401 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Translate German comments, fix some ws
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3063 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3063 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic7cf80655e6520f09a0b63b7839e46ad50de8fb1 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Philipp Weissenbacher p.weissenbac...@gmail.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#39468 Translate German comments - vcl/source/control/
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2966 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2966 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I736cf155e252293ed571cd44a6a395b15c4bf576 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian M. Heller christian.helle...@gmail.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#62525: use cow_wrapper for FontAttribute
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3074
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/74/3074/1
fdo#62525: use cow_wrapper for FontAttribute
Change-Id: Ic07da7c7cf225a910e6f0fa4f6d20c4700e7ec7a
---
M drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx
M drawinglayer/source/attribute/fontattribute.cxx
2 files changed, 31 insertions(+), 63 deletions(-)
diff --git a/drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx
b/drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx
index 36686fe..b49ab83 100644
--- a/drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_DRAWINGLAYER_ATTRIBUTE_FONTATTRIBUTE_HXX
#include drawinglayer/drawinglayerdllapi.h
+#include o3tl/cow_wrapper.hxx
//
// predefines
@@ -44,8 +45,11 @@
*/
class DRAWINGLAYER_DLLPUBLIC FontAttribute
{
+public:
+typedef o3tl::cow_wrapper ImpFontAttribute ImplType;
+
private:
-ImpFontAttribute* mpFontAttribute;
+ImplType mpFontAttribute;
public:
/// constructors/assignmentoperator/destructor
diff --git a/drawinglayer/source/attribute/fontattribute.cxx
b/drawinglayer/source/attribute/fontattribute.cxx
index 627fb6c..c2f23a7 100644
--- a/drawinglayer/source/attribute/fontattribute.cxx
+++ b/drawinglayer/source/attribute/fontattribute.cxx
@@ -29,9 +29,6 @@
class ImpFontAttribute
{
public:
-// refcounter
-sal_uInt32 mnRefCount;
-
/// core data
String maFamilyName; //
Font Family Name
String maStyleName;//
Font Style Name
@@ -57,8 +54,7 @@
bool bOutline,
bool bRTL,
bool bBiDiStrong)
-: mnRefCount(0),
-maFamilyName(rFamilyName),
+: maFamilyName(rFamilyName),
maStyleName(rStyleName),
mnWeight(nWeight),
mbSymbol(bSymbol),
@@ -68,6 +64,20 @@
mbRTL(bRTL),
mbBiDiStrong(bBiDiStrong),
mbMonospaced(bMonospaced)
+{
+}
+
+ImpFontAttribute()
+: maFamilyName(String()),
+maStyleName(String()),
+mnWeight(0),
+mbSymbol(false),
+mbVertical(false),
+mbItalic(false),
+mbOutline(false),
+mbRTL(false),
+mbBiDiStrong(false),
+mbMonospaced(false)
{
}
@@ -96,25 +106,13 @@
getBiDiStrong() == rCompare.getBiDiStrong()
getMonospaced() == rCompare.getMonospaced());
}
-
-static ImpFontAttribute* get_global_default()
-{
-static ImpFontAttribute* pDefault = 0;
-
-if(!pDefault)
-{
-pDefault = new ImpFontAttribute(
-String(), String(),
-0,
-false, false, false, false, false, false, false);
-
-// never delete; start with RefCount 1, not 0
-pDefault-mnRefCount++;
-}
-
-return pDefault;
-}
};
+
+namespace
+{
+struct theGlobalDefault :
+public rtl::Static FontAttribute::ImplType, theGlobalDefault
{};
+}
FontAttribute::FontAttribute(
const String rFamilyName,
@@ -127,73 +125,39 @@
bool bOutline,
bool bRTL,
bool bBiDiStrong)
-: mpFontAttribute(new ImpFontAttribute(
+: mpFontAttribute(ImpFontAttribute(
rFamilyName, rStyleName, nWeight, bSymbol, bVertical, bItalic,
bMonospaced, bOutline, bRTL, bBiDiStrong))
{
}
FontAttribute::FontAttribute()
-: mpFontAttribute(ImpFontAttribute::get_global_default())
+: mpFontAttribute(theGlobalDefault::get())
{
-mpFontAttribute-mnRefCount++;
}
FontAttribute::FontAttribute(const FontAttribute rCandidate)
: mpFontAttribute(rCandidate.mpFontAttribute)
{
-mpFontAttribute-mnRefCount++;
}
FontAttribute::~FontAttribute()
{
-if(mpFontAttribute-mnRefCount)
-{
-mpFontAttribute-mnRefCount--;
-}
-else
-{
-delete mpFontAttribute;
-}
}
[PATCH] fdo#62525: use cow_wrapper for FillHatchAttribute
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3073
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/73/3073/1
fdo#62525: use cow_wrapper for FillHatchAttribute
Change-Id: I1581b4bca6f14bd27af12ff40a4f4c0fe08af133
---
M drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx
M drawinglayer/source/attribute/fillhatchattribute.cxx
2 files changed, 27 insertions(+), 64 deletions(-)
diff --git a/drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx
b/drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx
index dc2665b..7e6244b 100644
--- a/drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLHATCHATTRIBUTE_HXX
#include drawinglayer/drawinglayerdllapi.h
+#include o3tl/cow_wrapper.hxx
//
// predefines
@@ -55,8 +56,11 @@
{
class DRAWINGLAYER_DLLPUBLIC FillHatchAttribute
{
+public:
+typedef o3tl::cow_wrapper ImpFillHatchAttribute ImplType;
+
private:
-ImpFillHatchAttribute* mpFillHatchAttribute;
+ImplType mpFillHatchAttribute;
public:
/// constructors/assignmentoperator/destructor
diff --git a/drawinglayer/source/attribute/fillhatchattribute.cxx
b/drawinglayer/source/attribute/fillhatchattribute.cxx
index d3d86ee..e89628b 100644
--- a/drawinglayer/source/attribute/fillhatchattribute.cxx
+++ b/drawinglayer/source/attribute/fillhatchattribute.cxx
@@ -19,6 +19,7 @@
#include drawinglayer/attribute/fillhatchattribute.hxx
#include basegfx/color/bcolor.hxx
+#include rtl/instance.hxx
//
@@ -29,9 +30,6 @@
class ImpFillHatchAttribute
{
public:
-// refcounter
-sal_uInt32 mnRefCount;
-
// data definitions
HatchStyle meStyle;
double mfDistance;
@@ -47,12 +45,20 @@
double fAngle,
const basegfx::BColor rColor,
bool bFillBackground)
-: mnRefCount(0),
-meStyle(eStyle),
+: meStyle(eStyle),
mfDistance(fDistance),
mfAngle(fAngle),
maColor(rColor),
mbFillBackground(bFillBackground)
+{
+}
+
+ImpFillHatchAttribute()
+: meStyle(HATCHSTYLE_SINGLE),
+mfDistance(0.0),
+mfAngle(0.0),
+maColor(basegfx::BColor()),
+mbFillBackground(false)
{
}
@@ -71,26 +77,13 @@
getColor() == rCandidate.getColor()
isFillBackground() == rCandidate.isFillBackground());
}
-
-static ImpFillHatchAttribute* get_global_default()
-{
-static ImpFillHatchAttribute* pDefault = 0;
-
-if(!pDefault)
-{
-pDefault = new ImpFillHatchAttribute(
-HATCHSTYLE_SINGLE,
-0.0, 0.0,
-basegfx::BColor(),
-false);
-
-// never delete; start with RefCount 1, not 0
-pDefault-mnRefCount++;
-}
-
-return pDefault;
-}
};
+
+namespace
+{
+struct theGlobalDefault :
+public rtl::Static FillHatchAttribute::ImplType,
theGlobalDefault {};
+}
FillHatchAttribute::FillHatchAttribute(
HatchStyle eStyle,
@@ -98,73 +91,39 @@
double fAngle,
const basegfx::BColor rColor,
bool bFillBackground)
-: mpFillHatchAttribute(new ImpFillHatchAttribute(
+: mpFillHatchAttribute(ImpFillHatchAttribute(
eStyle, fDistance, fAngle, rColor, bFillBackground))
{
}
FillHatchAttribute::FillHatchAttribute()
-: mpFillHatchAttribute(ImpFillHatchAttribute::get_global_default())
+: mpFillHatchAttribute(theGlobalDefault::get())
{
-mpFillHatchAttribute-mnRefCount++;
}
FillHatchAttribute::FillHatchAttribute(const FillHatchAttribute
rCandidate)
: mpFillHatchAttribute(rCandidate.mpFillHatchAttribute)
{
-mpFillHatchAttribute-mnRefCount++;
}
FillHatchAttribute::~FillHatchAttribute()
{
-if(mpFillHatchAttribute-mnRefCount)
-{
-mpFillHatchAttribute-mnRefCount--;
-}
[PUSHED] Translate German comments, fix some whitespace
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2916 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2916 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I44eba784d51522b67826051d20ba8939f195dccb Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Philipp Weissenbacher p.weissenbac...@gmail.com Gerrit-Reviewer: Chris Sherlock chris.sherloc...@gmail.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Fix spelling errors and typos: 'unkown' change to 'unknown'
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3030
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/30/3030/1
Fix spelling errors and typos: 'unkown' change to 'unknown'
Change-Id: Ia3ff77d2b99c9ef6c4c9b510bb30f349592c0b94
---
M autodoc/inc/ary/idl/ik_ce.hxx
M lingucomponent/source/languageguessing/guess.cxx
M starmath/inc/starmath.hrc
M starmath/source/parse.cxx
M starmath/source/smres.src
M svtools/source/config/menuoptions.cxx
M sw/source/filter/html/parcss1.hxx
M unotools/source/config/fontoptions.cxx
M unotools/source/config/localisationoptions.cxx
M unotools/source/config/securityoptions.cxx
M unotools/source/config/workingsetoptions.cxx
11 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/autodoc/inc/ary/idl/ik_ce.hxx b/autodoc/inc/ary/idl/ik_ce.hxx
index 3b0e59f..f86994d 100644
--- a/autodoc/inc/ary/idl/ik_ce.hxx
+++ b/autodoc/inc/ary/idl/ik_ce.hxx
@@ -107,10 +107,6 @@
TagVersion(
const CodeEntity i_ce );
-voidGet_UnkownTags(
-Dyn_CeIterator o_result,
-const CodeEntity i_ce );
-
boolIsDeprecated(
const CodeEntity i_ce );
boolIsIncomplete(
diff --git a/lingucomponent/source/languageguessing/guess.cxx
b/lingucomponent/source/languageguessing/guess.cxx
index fa07ba9..f107e72 100644
--- a/lingucomponent/source/languageguessing/guess.cxx
+++ b/lingucomponent/source/languageguessing/guess.cxx
@@ -53,11 +53,11 @@
string enc;
//if the guess is not like UNKNOWN or SHORT, go into the brackets
-// if(strncmp((const char*)(guess_str + 1), _TEXTCAT_RESULT_UNKOWN,
strlen(_TEXTCAT_RESULT_UNKOWN)) != 0
+// if(strncmp((const char*)(guess_str + 1), _TEXTCAT_RESULT_UNKNOWN,
strlen(_TEXTCAT_RESULT_UNKNOWN)) != 0
//
//strncmp((const char*)(guess_str + 1), _TEXTCAT_RESULT_SHORT,
strlen(_TEXTCAT_RESULT_SHORT)) != 0)
// {
-if(strcmp((const char*)(guess_str + 1), _TEXTCAT_RESULT_UNKOWN) != 0
+if(strcmp((const char*)(guess_str + 1), _TEXTCAT_RESULT_UNKNOWN) != 0
strcmp((const char*)(guess_str + 1), _TEXTCAT_RESULT_SHORT) != 0)
{
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index 64357f9..ed1eb26 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -117,7 +117,7 @@
#define STR_CMDBOXWINDOW(RID_APP_START + 825)
#define RID_ERR_IDENT (RID_APP_START + 920)
-#define RID_ERR_UNKOWN (RID_APP_START + 921)
+#define RID_ERR_UNKNOWN (RID_APP_START + 921)
#define RID_ERR_UNEXPECTEDCHARACTER (RID_APP_START + 922)
#define RID_ERR_LGROUPEXPECTED (RID_APP_START + 923)
#define RID_ERR_RGROUPEXPECTED (RID_APP_START + 924)
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 95bda3b..b05345d 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -2505,7 +2505,7 @@
case PE_RIGHT_EXPECTED: nRID = RID_ERR_RIGHTEXPECTED;
break;
default:
-nRID = RID_ERR_UNKOWN;
+nRID = RID_ERR_UNKNOWN;
}
pErrDesc-Text += SM_RESSTR(nRID);
diff --git a/starmath/source/smres.src b/starmath/source/smres.src
index 3fd07cf..0e5ebf5 100644
--- a/starmath/source/smres.src
+++ b/starmath/source/smres.src
@@ -1611,7 +1611,7 @@
Text [ en-US ] = ERROR : ;
};
-String RID_ERR_UNKOWN
+String RID_ERR_UNKNOWN
{
Text [ en-US ] = Unknown error occurred ;
};
diff --git a/svtools/source/config/menuoptions.cxx
b/svtools/source/config/menuoptions.cxx
index 942417a..0680e05 100644
--- a/svtools/source/config/menuoptions.cxx
+++ b/svtools/source/config/menuoptions.cxx
@@ -335,7 +335,7 @@
}
#if OSL_DEBUG_LEVEL 1
-else DBG_ASSERT( sal_False, SvtMenuOptions_Impl::Notify()\nUnkown
property detected ... I can't handle these!\n );
+else DBG_ASSERT( sal_False, SvtMenuOptions_Impl::Notify()\nUnknown
property detected ... I can't handle these!\n );
#endif
}
diff --git a/sw/source/filter/html/parcss1.hxx
b/sw/source/filter/html/parcss1.hxx
index a954a4c..2082019 100644
--- a/sw/source/filter/html/parcss1.hxx
+++ b/sw/source/filter/html/parcss1.hxx
@@ -24,7 +24,7 @@
enum CSS1Token
{
CSS1_NULL,
-CSS1_UNKOWN,
+CSS1_UNKNOWN,
CSS1_IDENT,
CSS1_STRING,
diff --git a/unotools/source/config/fontoptions.cxx
b/unotools/source/config/fontoptions.cxx
index 768e4f9..16c616d 100644
--- a/unotools/source/config/fontoptions.cxx
+++ b/unotools/source/config/fontoptions.cxx
@@ -223,7 +223,7 @@
seqValues[nProperty] = m_bFontWYSIWYG;
}
#if OSL_DEBUG_LEVEL 1
-else DBG_ASSERT( sal_False, SvtFontOptions_Impl::Notify()\nUnkown
property detected ... I can't handle
[ABANDONED] [draft] use pragma once
Thomas Arnhold has abandoned this change. Change subject: [draft] use pragma once .. Patch Set 3: Abandoned Not as easy as it seems. Clashes with Windows headers at least. Why ever... -- To view, visit https://gerrit.libreoffice.org/2875 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I81e28f0241d35e13381c85cef0327d45c7f9b2c1 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Thomas Arnhold tho...@arnhold.org Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] General comment cleanup for demo/test vcl apps
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2921 Approvals: Tor Lillqvist: Verified; Looks good to me, approved Thomas Arnhold: -- To view, visit https://gerrit.libreoffice.org/2921 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I37a19177795aa93d63f736e1933924605fbf2146 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Chris Sherlock chris.sherloc...@gmail.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Improve size and positions of widgets for CustomAnimationDia...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2932 -- To view, visit https://gerrit.libreoffice.org/2932 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I38a9cbd533c742657c4af6c83d146706684c1ff6 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Xiaoli Duan duan19002...@gmail.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#39468 Translate German comments - vcl/win/source/app
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2938 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2938 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5bd5851f763a392cad658d206d23ea055456fce2 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian M. Heller christian.helle...@gmail.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] wip
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2944
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/44/2944/1
wip
Change-Id: I23427e1e3bfb583ef10123577ebec76af617f917
---
M vcl/inc/vcl/bitmap.hxx
M vcl/source/gdi/bitmap.cxx
M vcl/source/gdi/bmpacc.cxx
3 files changed, 3 insertions(+), 38 deletions(-)
diff --git a/vcl/inc/vcl/bitmap.hxx b/vcl/inc/vcl/bitmap.hxx
index 7753083..d25a0ce 100644
--- a/vcl/inc/vcl/bitmap.hxx
+++ b/vcl/inc/vcl/bitmap.hxx
@@ -20,6 +20,7 @@
#ifndef _SV_BITMAP_HXX
#define _SV_BITMAP_HXX
+#include o3tl/cow_wrapper.hxx
#include tools/link.hxx
#include tools/solar.h
#include vcl/dllapi.h
@@ -302,7 +303,7 @@
{
private:
-ImpBitmap* mpImpBmp;
+o3tl::cow_wrapper ImpBitmap mpImpBmp;
MapMode maPrefMapMode;
SizemaPrefSize;
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index 64d8f4e..6cf0cac 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -52,9 +52,6 @@
maPrefSize ( rBitmap.maPrefSize )
{
mpImpBmp = rBitmap.mpImpBmp;
-
-if ( mpImpBmp )
-mpImpBmp-ImplIncRefCount();
}
Bitmap::Bitmap( SalBitmap* pSalBitmap )
@@ -121,7 +118,7 @@
pRealPal = (BitmapPalette*) pPal;
}
-mpImpBmp = new ImpBitmap;
+mpImpBmp = ImpBitmap;
mpImpBmp-ImplCreate( rSizePixel, nBitCount, pRealPal ? *pRealPal :
aPal );
}
else
@@ -231,10 +228,6 @@
maPrefSize = rBitmap.maPrefSize;
maPrefMapMode = rBitmap.maPrefMapMode;
-if ( rBitmap.mpImpBmp )
-rBitmap.mpImpBmp-ImplIncRefCount();
-
-ImplReleaseRef();
mpImpBmp = rBitmap.mpImpBmp;
return *this;
@@ -253,7 +246,6 @@
maPrefMapMode = MapMode();
maPrefSize = Size();
-ImplReleaseRef();
mpImpBmp = NULL;
}
@@ -342,33 +334,6 @@
}
return nRet;
-}
-
-void Bitmap::ImplReleaseRef()
-{
-if( mpImpBmp )
-{
-if( mpImpBmp-ImplGetRefCount() 1UL )
-mpImpBmp-ImplDecRefCount();
-else
-{
-delete mpImpBmp;
-mpImpBmp = NULL;
-}
-}
-}
-
-void Bitmap::ImplMakeUnique()
-{
-if( mpImpBmp mpImpBmp-ImplGetRefCount() 1UL )
-{
-ImpBitmap* pOldImpBmp = mpImpBmp;
-
-pOldImpBmp-ImplDecRefCount();
-
-mpImpBmp = new ImpBitmap;
-mpImpBmp-ImplCreate( *pOldImpBmp );
-}
}
void Bitmap::ImplAssignWithSize( const Bitmap rBitmap )
diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx
index b9d970c..48fd1e0 100644
--- a/vcl/source/gdi/bmpacc.cxx
+++ b/vcl/source/gdi/bmpacc.cxx
@@ -71,7 +71,6 @@
{
if( mbModify !maBitmap.ImplGetImpBitmap() )
{
-rBitmap.ImplMakeUnique();
pImpBmp = rBitmap.ImplGetImpBitmap();
}
else
--
To view, visit https://gerrit.libreoffice.org/2944
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I23427e1e3bfb583ef10123577ebec76af617f917
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Thomas Arnhold tho...@arnhold.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#62525: use cow_wrapper for SdrShadowAttribute
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2945
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/45/2945/1
fdo#62525: use cow_wrapper for SdrShadowAttribute
Thanks to Thorsten.
Change-Id: I2713bacd10538dfe177cb975a9633dd65285c6fa
---
M drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx
M drawinglayer/source/attribute/sdrshadowattribute.cxx
2 files changed, 26 insertions(+), 63 deletions(-)
diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx
b/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx
index 91657cd..ee1f362 100644
--- a/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRSHADOWATTRIBUTE_HXX
#include drawinglayer/drawinglayerdllapi.h
+#include o3tl/cow_wrapper.hxx
//
// predefines
@@ -42,8 +43,11 @@
{
class DRAWINGLAYER_DLLPUBLIC SdrShadowAttribute
{
+public:
+typedef o3tl::cow_wrapper ImpSdrShadowAttribute ImplType;
+
private:
-ImpSdrShadowAttribute* mpSdrShadowAttribute;
+ImplType mpSdrShadowAttribute;
public:
/// constructors/assignmentoperator/destructor
diff --git a/drawinglayer/source/attribute/sdrshadowattribute.cxx
b/drawinglayer/source/attribute/sdrshadowattribute.cxx
index f6b5e49..9705f6a 100644
--- a/drawinglayer/source/attribute/sdrshadowattribute.cxx
+++ b/drawinglayer/source/attribute/sdrshadowattribute.cxx
@@ -20,6 +20,7 @@
#include drawinglayer/attribute/sdrshadowattribute.hxx
#include basegfx/vector/b2dvector.hxx
#include basegfx/color/bcolor.hxx
+#include rtl/instance.hxx
//
@@ -30,9 +31,6 @@
class ImpSdrShadowAttribute
{
public:
-// refcounter
-sal_uInt32 mnRefCount;
-
// shadow definitions
basegfx::B2DVector maOffset; //
shadow offset 1/100th mm
double mfTransparence; //
[0.0 .. 1.0], 0.0==no transp.
@@ -42,10 +40,16 @@
const basegfx::B2DVector rOffset,
double fTransparence,
const basegfx::BColor rColor)
-: mnRefCount(0),
-maOffset(rOffset),
+: maOffset(rOffset),
mfTransparence(fTransparence),
maColor(rColor)
+{
+}
+
+ImpSdrShadowAttribute()
+: maOffset(basegfx::B2DVector()),
+mfTransparence(0.0),
+maColor(basegfx::BColor())
{
}
@@ -60,97 +64,52 @@
getTransparence() == rCandidate.getTransparence()
getColor() == rCandidate.getColor());
}
-
-static ImpSdrShadowAttribute* get_global_default()
-{
-static ImpSdrShadowAttribute* pDefault = 0;
-
-if(!pDefault)
-{
-pDefault = new ImpSdrShadowAttribute(
-basegfx::B2DVector(),
-0.0,
-basegfx::BColor());
-
-// never delete; start with RefCount 1, not 0
-pDefault-mnRefCount++;
-}
-
-return pDefault;
-}
};
+
+namespace
+{
+struct theGlobalDefault :
+public rtl::Static SdrShadowAttribute::ImplType,
theGlobalDefault {};
+}
+
SdrShadowAttribute::SdrShadowAttribute(
const basegfx::B2DVector rOffset,
double fTransparence,
const basegfx::BColor rColor)
-: mpSdrShadowAttribute(new ImpSdrShadowAttribute(
+: mpSdrShadowAttribute(ImpSdrShadowAttribute(
rOffset, fTransparence, rColor))
{
}
SdrShadowAttribute::SdrShadowAttribute()
-: mpSdrShadowAttribute(ImpSdrShadowAttribute::get_global_default())
+: mpSdrShadowAttribute(theGlobalDefault::get())
{
-mpSdrShadowAttribute-mnRefCount++;
}
SdrShadowAttribute::SdrShadowAttribute(const SdrShadowAttribute
rCandidate)
: mpSdrShadowAttribute(rCandidate.mpSdrShadowAttribute)
{
-mpSdrShadowAttribute-mnRefCount++;
}
SdrShadowAttribute::~SdrShadowAttribute()
{
-if(mpSdrShadowAttribute-mnRefCount)
-{
-mpSdrShadowAttribute-mnRefCount--;
-}
-else
-{
-delete
[ABANDONED] wip
Thomas Arnhold has abandoned this change. Change subject: wip .. Patch Set 1: Abandoned ... -- To view, visit https://gerrit.libreoffice.org/2944 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I23427e1e3bfb583ef10123577ebec76af617f917 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#62525: use cow_wrapper for SdrShadowAttribute
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2946
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/46/2946/1
fdo#62525: use cow_wrapper for SdrShadowAttribute
Thanks to Thorsten.
Change-Id: I9b5435d2326e9ebf340e88025eeea25ff6388ea2
---
M drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx
M drawinglayer/source/attribute/sdrshadowattribute.cxx
2 files changed, 26 insertions(+), 63 deletions(-)
diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx
b/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx
index 91657cd..ee1f362 100644
--- a/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRSHADOWATTRIBUTE_HXX
#include drawinglayer/drawinglayerdllapi.h
+#include o3tl/cow_wrapper.hxx
//
// predefines
@@ -42,8 +43,11 @@
{
class DRAWINGLAYER_DLLPUBLIC SdrShadowAttribute
{
+public:
+typedef o3tl::cow_wrapper ImpSdrShadowAttribute ImplType;
+
private:
-ImpSdrShadowAttribute* mpSdrShadowAttribute;
+ImplType mpSdrShadowAttribute;
public:
/// constructors/assignmentoperator/destructor
diff --git a/drawinglayer/source/attribute/sdrshadowattribute.cxx
b/drawinglayer/source/attribute/sdrshadowattribute.cxx
index f6b5e49..9705f6a 100644
--- a/drawinglayer/source/attribute/sdrshadowattribute.cxx
+++ b/drawinglayer/source/attribute/sdrshadowattribute.cxx
@@ -20,6 +20,7 @@
#include drawinglayer/attribute/sdrshadowattribute.hxx
#include basegfx/vector/b2dvector.hxx
#include basegfx/color/bcolor.hxx
+#include rtl/instance.hxx
//
@@ -30,9 +31,6 @@
class ImpSdrShadowAttribute
{
public:
-// refcounter
-sal_uInt32 mnRefCount;
-
// shadow definitions
basegfx::B2DVector maOffset; //
shadow offset 1/100th mm
double mfTransparence; //
[0.0 .. 1.0], 0.0==no transp.
@@ -42,10 +40,16 @@
const basegfx::B2DVector rOffset,
double fTransparence,
const basegfx::BColor rColor)
-: mnRefCount(0),
-maOffset(rOffset),
+: maOffset(rOffset),
mfTransparence(fTransparence),
maColor(rColor)
+{
+}
+
+ImpSdrShadowAttribute()
+: maOffset(basegfx::B2DVector()),
+mfTransparence(0.0),
+maColor(basegfx::BColor())
{
}
@@ -60,97 +64,52 @@
getTransparence() == rCandidate.getTransparence()
getColor() == rCandidate.getColor());
}
-
-static ImpSdrShadowAttribute* get_global_default()
-{
-static ImpSdrShadowAttribute* pDefault = 0;
-
-if(!pDefault)
-{
-pDefault = new ImpSdrShadowAttribute(
-basegfx::B2DVector(),
-0.0,
-basegfx::BColor());
-
-// never delete; start with RefCount 1, not 0
-pDefault-mnRefCount++;
-}
-
-return pDefault;
-}
};
+
+namespace
+{
+struct theGlobalDefault :
+public rtl::Static SdrShadowAttribute::ImplType,
theGlobalDefault {};
+}
+
SdrShadowAttribute::SdrShadowAttribute(
const basegfx::B2DVector rOffset,
double fTransparence,
const basegfx::BColor rColor)
-: mpSdrShadowAttribute(new ImpSdrShadowAttribute(
+: mpSdrShadowAttribute(ImpSdrShadowAttribute(
rOffset, fTransparence, rColor))
{
}
SdrShadowAttribute::SdrShadowAttribute()
-: mpSdrShadowAttribute(ImpSdrShadowAttribute::get_global_default())
+: mpSdrShadowAttribute(theGlobalDefault::get())
{
-mpSdrShadowAttribute-mnRefCount++;
}
SdrShadowAttribute::SdrShadowAttribute(const SdrShadowAttribute
rCandidate)
: mpSdrShadowAttribute(rCandidate.mpSdrShadowAttribute)
{
-mpSdrShadowAttribute-mnRefCount++;
}
SdrShadowAttribute::~SdrShadowAttribute()
{
-if(mpSdrShadowAttribute-mnRefCount)
-{
-mpSdrShadowAttribute-mnRefCount--;
-}
-else
-{
-delete
[ABANDONED] fdo#62525: use cow_wrapper for SdrShadowAttribute
Thomas Arnhold has abandoned this change. Change subject: fdo#62525: use cow_wrapper for SdrShadowAttribute .. Patch Set 1: Abandoned bla -- To view, visit https://gerrit.libreoffice.org/2945 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I2713bacd10538dfe177cb975a9633dd65285c6fa Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#62525: use cow_wrapper for FillBitmapAttribute
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2948
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/48/2948/1
fdo#62525: use cow_wrapper for FillBitmapAttribute
Change-Id: I0f666d4baaf6dc4e9f7ea30a518a8904f01d749f
---
M drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx
M drawinglayer/source/attribute/fillbitmapattribute.cxx
2 files changed, 24 insertions(+), 62 deletions(-)
diff --git a/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx
b/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx
index ced46b3..851dc5e 100644
--- a/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLBITMAPATTRIBUTE_HXX
#include drawinglayer/drawinglayerdllapi.h
+#include o3tl/cow_wrapper.hxx
//
// predefines
@@ -44,8 +45,11 @@
{
class DRAWINGLAYER_DLLPUBLIC FillBitmapAttribute
{
+public:
+typedef o3tl::cow_wrapper ImpFillBitmapAttribute ImplType;
+
private:
-ImpFillBitmapAttribute* mpFillBitmapAttribute;
+ImplType mpFillBitmapAttribute;
public:
/// constructors/assignmentoperator/destructor
diff --git a/drawinglayer/source/attribute/fillbitmapattribute.cxx
b/drawinglayer/source/attribute/fillbitmapattribute.cxx
index b315178..e2bedb4 100644
--- a/drawinglayer/source/attribute/fillbitmapattribute.cxx
+++ b/drawinglayer/source/attribute/fillbitmapattribute.cxx
@@ -29,9 +29,6 @@
class ImpFillBitmapAttribute
{
public:
-// refcounter
-sal_uInt32 mnRefCount;
-
// data definitions
BitmapExmaBitmapEx;
basegfx::B2DPoint maTopLeft;
@@ -45,11 +42,18 @@
const basegfx::B2DPoint rTopLeft,
const basegfx::B2DVector rSize,
bool bTiling)
-: mnRefCount(0),
-maBitmapEx(rBitmapEx),
+: maBitmapEx(rBitmapEx),
maTopLeft(rTopLeft),
maSize(rSize),
mbTiling(bTiling)
+{
+}
+
+ImpFillBitmapAttribute()
+: maBitmapEx(BitmapEx()),
+maTopLeft(basegfx::B2DPoint()),
+maSize(basegfx::B2DVector()),
+mbTiling(false)
{
}
@@ -66,33 +70,20 @@
const basegfx::B2DPoint getTopLeft() const { return maTopLeft; }
const basegfx::B2DVector getSize() const { return maSize; }
bool getTiling() const { return mbTiling; }
-
-static ImpFillBitmapAttribute* get_global_default()
-{
-static ImpFillBitmapAttribute* pDefault = 0;
-
-if(!pDefault)
-{
-pDefault = new ImpFillBitmapAttribute(
-BitmapEx(),
-basegfx::B2DPoint(),
-basegfx::B2DVector(),
-false);
-
-// never delete; start with RefCount 1, not 0
-pDefault-mnRefCount++;
-}
-
-return pDefault;
-}
};
+
+namespace
+{
+struct theGlobalDefault :
+public rtl::Static FillBitmapAttribute::ImplType,
theGlobalDefault {};
+}
FillBitmapAttribute::FillBitmapAttribute(
const BitmapEx rBitmapEx,
const basegfx::B2DPoint rTopLeft,
const basegfx::B2DVector rSize,
bool bTiling)
-: mpFillBitmapAttribute(new ImpFillBitmapAttribute(
+: mpFillBitmapAttribute(ImpFillBitmapAttribute(
rBitmapEx, rTopLeft, rSize, bTiling))
{
}
@@ -100,59 +91,26 @@
FillBitmapAttribute::FillBitmapAttribute(const FillBitmapAttribute
rCandidate)
: mpFillBitmapAttribute(rCandidate.mpFillBitmapAttribute)
{
-mpFillBitmapAttribute-mnRefCount++;
}
FillBitmapAttribute::~FillBitmapAttribute()
{
-if(mpFillBitmapAttribute-mnRefCount)
-{
-mpFillBitmapAttribute-mnRefCount--;
-}
-else
-{
-delete mpFillBitmapAttribute;
-}
}
bool FillBitmapAttribute::isDefault() const
{
-return mpFillBitmapAttribute ==
ImpFillBitmapAttribute::get_global_default();
+return mpFillBitmapAttribute.same_object(theGlobalDefault::get());
}
FillBitmapAttribute FillBitmapAttribute::operator=(const
[PATCH] fdo#62525: use cow_wrapper for FillGradientAttribute
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2951
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/51/2951/1
fdo#62525: use cow_wrapper for FillGradientAttribute
Change-Id: I85a9864820f49da8ebcc4a7d2c80a3c9d0c13b27
---
M drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx
M drawinglayer/source/attribute/fillgradientattribute.cxx
2 files changed, 29 insertions(+), 65 deletions(-)
diff --git a/drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx
b/drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx
index 6d01c86..e791193 100644
--- a/drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLGRADIENTATTRIBUTE_HXX
#include drawinglayer/drawinglayerdllapi.h
+#include o3tl/cow_wrapper.hxx
//
// predefines
@@ -58,8 +59,11 @@
{
class DRAWINGLAYER_DLLPUBLIC FillGradientAttribute
{
+public:
+typedef o3tl::cow_wrapper ImpFillGradientAttribute ImplType;
+
private:
-ImpFillGradientAttribute* mpFillGradientAttribute;
+ImplType mpFillGradientAttribute;
public:
/// constructors/assignmentoperator/destructor
diff --git a/drawinglayer/source/attribute/fillgradientattribute.cxx
b/drawinglayer/source/attribute/fillgradientattribute.cxx
index 987082c..638aa93 100644
--- a/drawinglayer/source/attribute/fillgradientattribute.cxx
+++ b/drawinglayer/source/attribute/fillgradientattribute.cxx
@@ -29,9 +29,6 @@
class ImpFillGradientAttribute
{
public:
-// refcounter
-sal_uInt32 mnRefCount;
-
// data definitions
GradientStyle meStyle;
double mfBorder;
@@ -51,8 +48,7 @@
const basegfx::BColor rStartColor,
const basegfx::BColor rEndColor,
sal_uInt16 nSteps)
-: mnRefCount(0),
-meStyle(eStyle),
+: meStyle(eStyle),
mfBorder(fBorder),
mfOffsetX(fOffsetX),
mfOffsetY(fOffsetY),
@@ -60,6 +56,18 @@
maStartColor(rStartColor),
maEndColor(rEndColor),
mnSteps(nSteps)
+{
+}
+
+ImpFillGradientAttribute()
+: meStyle(GRADIENTSTYLE_LINEAR),
+mfBorder(0.0),
+mfOffsetX(0.0),
+mfOffsetY(0.0),
+mfAngle(0.0),
+maStartColor(basegfx::BColor()),
+maEndColor(basegfx::BColor()),
+mnSteps(0)
{
}
@@ -84,27 +92,13 @@
getEndColor() == rCandidate.getEndColor()
getSteps() == rCandidate.getSteps());
}
-
-static ImpFillGradientAttribute* get_global_default()
-{
-static ImpFillGradientAttribute* pDefault = 0;
-
-if(!pDefault)
-{
-pDefault = new ImpFillGradientAttribute(
-GRADIENTSTYLE_LINEAR,
-0.0, 0.0, 0.0, 0.0,
-basegfx::BColor(),
-basegfx::BColor(),
-0);
-
-// never delete; start with RefCount 1, not 0
-pDefault-mnRefCount++;
-}
-
-return pDefault;
-}
};
+
+namespace
+{
+struct theGlobalDefault :
+public rtl::Static FillGradientAttribute::ImplType,
theGlobalDefault {};
+}
FillGradientAttribute::FillGradientAttribute(
GradientStyle eStyle,
@@ -115,73 +109,39 @@
const basegfx::BColor rStartColor,
const basegfx::BColor rEndColor,
sal_uInt16 nSteps)
-: mpFillGradientAttribute(new ImpFillGradientAttribute(
+: mpFillGradientAttribute(ImpFillGradientAttribute(
eStyle, fBorder, fOffsetX, fOffsetY, fAngle, rStartColor,
rEndColor, nSteps))
{
}
FillGradientAttribute::FillGradientAttribute()
-:
mpFillGradientAttribute(ImpFillGradientAttribute::get_global_default())
+: mpFillGradientAttribute(theGlobalDefault::get())
{
-mpFillGradientAttribute-mnRefCount++;
}
FillGradientAttribute::FillGradientAttribute(const
FillGradientAttribute rCandidate)
: mpFillGradientAttribute(rCandidate.mpFillGradientAttribute)
{
-mpFillGradientAttribute-mnRefCount++;
[PUSHED] Change duplicate short-cut Alt-I-U
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2943 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2943 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0cabf39b3844a056a6c1d83a7941715435fb6307 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Rob Snelders libreoff...@ertai.nl Gerrit-Reviewer: Björn Michaelsen bjoern.michael...@canonical.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#62525: use cow_wrapper for FillGradientAttribute
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2954
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/54/2954/1
fdo#62525: use cow_wrapper for FillGradientAttribute
a xmlsecurity/workben/signaturetest.cxx.wo
Change-Id: I13aa9817d7abd3753579f6825c166191a836eef3
---
M drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx
M drawinglayer/source/attribute/fillgradientattribute.cxx
2 files changed, 30 insertions(+), 65 deletions(-)
diff --git a/drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx
b/drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx
index 6d01c86..e791193 100644
--- a/drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLGRADIENTATTRIBUTE_HXX
#include drawinglayer/drawinglayerdllapi.h
+#include o3tl/cow_wrapper.hxx
//
// predefines
@@ -58,8 +59,11 @@
{
class DRAWINGLAYER_DLLPUBLIC FillGradientAttribute
{
+public:
+typedef o3tl::cow_wrapper ImpFillGradientAttribute ImplType;
+
private:
-ImpFillGradientAttribute* mpFillGradientAttribute;
+ImplType mpFillGradientAttribute;
public:
/// constructors/assignmentoperator/destructor
diff --git a/drawinglayer/source/attribute/fillgradientattribute.cxx
b/drawinglayer/source/attribute/fillgradientattribute.cxx
index 987082c..6664791 100644
--- a/drawinglayer/source/attribute/fillgradientattribute.cxx
+++ b/drawinglayer/source/attribute/fillgradientattribute.cxx
@@ -19,6 +19,7 @@
#include drawinglayer/attribute/fillgradientattribute.hxx
#include basegfx/color/bcolor.hxx
+#include rtl/instance.hxx
//
@@ -29,9 +30,6 @@
class ImpFillGradientAttribute
{
public:
-// refcounter
-sal_uInt32 mnRefCount;
-
// data definitions
GradientStyle meStyle;
double mfBorder;
@@ -51,8 +49,7 @@
const basegfx::BColor rStartColor,
const basegfx::BColor rEndColor,
sal_uInt16 nSteps)
-: mnRefCount(0),
-meStyle(eStyle),
+: meStyle(eStyle),
mfBorder(fBorder),
mfOffsetX(fOffsetX),
mfOffsetY(fOffsetY),
@@ -60,6 +57,18 @@
maStartColor(rStartColor),
maEndColor(rEndColor),
mnSteps(nSteps)
+{
+}
+
+ImpFillGradientAttribute()
+: meStyle(GRADIENTSTYLE_LINEAR),
+mfBorder(0.0),
+mfOffsetX(0.0),
+mfOffsetY(0.0),
+mfAngle(0.0),
+maStartColor(basegfx::BColor()),
+maEndColor(basegfx::BColor()),
+mnSteps(0)
{
}
@@ -84,27 +93,13 @@
getEndColor() == rCandidate.getEndColor()
getSteps() == rCandidate.getSteps());
}
-
-static ImpFillGradientAttribute* get_global_default()
-{
-static ImpFillGradientAttribute* pDefault = 0;
-
-if(!pDefault)
-{
-pDefault = new ImpFillGradientAttribute(
-GRADIENTSTYLE_LINEAR,
-0.0, 0.0, 0.0, 0.0,
-basegfx::BColor(),
-basegfx::BColor(),
-0);
-
-// never delete; start with RefCount 1, not 0
-pDefault-mnRefCount++;
-}
-
-return pDefault;
-}
};
+
+namespace
+{
+struct theGlobalDefault :
+public rtl::Static FillGradientAttribute::ImplType,
theGlobalDefault {};
+}
FillGradientAttribute::FillGradientAttribute(
GradientStyle eStyle,
@@ -115,73 +110,39 @@
const basegfx::BColor rStartColor,
const basegfx::BColor rEndColor,
sal_uInt16 nSteps)
-: mpFillGradientAttribute(new ImpFillGradientAttribute(
+: mpFillGradientAttribute(ImpFillGradientAttribute(
eStyle, fBorder, fOffsetX, fOffsetY, fAngle, rStartColor,
rEndColor, nSteps))
{
}
FillGradientAttribute::FillGradientAttribute()
-:
mpFillGradientAttribute(ImpFillGradientAttribute::get_global_default())
+: mpFillGradientAttribute(theGlobalDefault::get())
{
-
[PUSHED] fdo#39468 Translate German Comments - salframe.cxx
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2931 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2931 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0a5655ac1b1b4feca0b3a5ed3d4c37a63bce6c5a Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian M. Heller christian.helle...@gmail.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#39468 Translate German comments - vcl/win/source/gdi/
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2937 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2937 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I273bab015f96128ab5128ade3b8e0c69b0ef730e Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian M. Heller christian.helle...@gmail.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] basic: Remove non working AboutStarBasic
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2899
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/99/2899/1
basic: Remove non working AboutStarBasic
The content of this function was commented out since the first import. So as it
does nothing remove it.
Change-Id: Ia46674f7bdc12e80d61a8142697e875f5c58f482
---
M basic/source/runtime/methods.cxx
M basic/source/runtime/rtlproto.hxx
M basic/source/runtime/stdobj.cxx
3 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 0318b82..64c0eb6 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -4330,13 +4330,6 @@
//-
-RTLFUNC(AboutStarBasic)
-{
-(void)pBasic;
-(void)bWrite;
-(void)rPar;
-}
-
RTLFUNC(MsgBox)
{
(void)pBasic;
diff --git a/basic/source/runtime/rtlproto.hxx
b/basic/source/runtime/rtlproto.hxx
index b13d664..ccf0a3b 100644
--- a/basic/source/runtime/rtlproto.hxx
+++ b/basic/source/runtime/rtlproto.hxx
@@ -275,7 +275,6 @@
extern RTLFUNC(Load);
extern RTLFUNC(Unload);
-extern RTLFUNC(AboutStarBasic);
extern RTLFUNC(LoadPicture);
extern RTLFUNC(SavePicture);
diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx
index 2a69f44..1e882c2 100644
--- a/basic/source/runtime/stdobj.cxx
+++ b/basic/source/runtime/stdobj.cxx
@@ -80,8 +80,6 @@
static Methods aMethods[] = {
-{ AboutStarBasic, SbxNULL, 1 | _FUNCTION, RTLNAME(AboutStarBasic),0 },
- { Name, SbxSTRING, 0,NULL,0 },
{ Abs,SbxDOUBLE,1 | _FUNCTION, RTLNAME(Abs),0 },
{ number, SbxDOUBLE, 0,NULL,0 },
{ Array, SbxOBJECT,_FUNCTION, RTLNAME(Array),0 },
--
To view, visit https://gerrit.libreoffice.org/2899
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia46674f7bdc12e80d61a8142697e875f5c58f482
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Thomas Arnhold tho...@arnhold.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] clean up DBG_ERRORn
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2900
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/00/2900/1
clean up DBG_ERRORn
Those were DBG_ERRORn before and were falsely changed to OSL_TRACE by me.
See:
1707a350af8a0909ae88c2b11deb714f8b2a93ff
533f89e49395bbc31baaab9ade46db934b383e14
Change-Id: I4f4188ba25b988128a539542f49797ea6985702e
---
M oox/source/export/SchXMLSeriesHelper.cxx
M oox/source/export/chartexport.cxx
M sal/inc/sal/log-areas.dox
M tools/source/generic/config.cxx
M vcl/source/window/accel.cxx
M vcl/source/window/winproc.cxx
6 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/oox/source/export/SchXMLSeriesHelper.cxx
b/oox/source/export/SchXMLSeriesHelper.cxx
index 802fc01..a41 100644
--- a/oox/source/export/SchXMLSeriesHelper.cxx
+++ b/oox/source/export/SchXMLSeriesHelper.cxx
@@ -26,8 +26,6 @@
#include com/sun/star/lang/XMultiServiceFactory.hpp
#include rtl/ustring.h
-// header for define DBG_ERROR1
-#include tools/debug.hxx
#include typeinfo
@@ -201,8 +199,7 @@
catch( const uno::Exception rEx )
{
(void)rEx; // avoid warning for pro build
-OSL_TRACE( Exception caught
SchXMLSeriesHelper::createOldAPISeriesPropertySet: %s,
-OUStringToOString( rEx.Message,
RTL_TEXTENCODING_ASCII_US ).getStr() );
+SAL_WARN( oox, Exception caught
SchXMLSeriesHelper::createOldAPISeriesPropertySet: rEx.Message );
}
}
@@ -240,8 +237,7 @@
{
(void)rEx; // avoid warning for pro build
-OSL_TRACE( Exception caught
SchXMLSeriesHelper::createOldAPIDataPointPropertySet: %s,
-OUStringToOString( rEx.Message,
RTL_TEXTENCODING_ASCII_US ).getStr() );
+SAL_WARN( oox, Exception caught
SchXMLSeriesHelper::createOldAPIDataPointPropertySet: rEx.Message );
}
}
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index 2d24717..5cab754 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2417,8 +2417,7 @@
catch( const uno::Exception rEx )
{
(void)rEx; // avoid warning for pro build
-OSL_TRACE( Exception caught during Export of data point:
%s,
-OUStringToOString( rEx.Message,
RTL_TEXTENCODING_ASCII_US ).getStr() );
+SAL_WARN( oox, Exception caught during Export of data
point: rEx.Message );
}
}
else
diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox
index 3bb316f..07c7399 100644
--- a/sal/inc/sal/log-areas.dox
+++ b/sal/inc/sal/log-areas.dox
@@ -195,6 +195,7 @@
@li @c tools.debug
@li @c tools.datetime
+@li @c tools.generic
@li @c tools.memtools
@li @c tools.rc - resource manager
@li @c tools.stream - SvStream class
diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx
index 9d2d284..dac13f0 100644
--- a/tools/source/generic/config.cxx
+++ b/tools/source/generic/config.cxx
@@ -537,15 +537,8 @@
static void ImplWriteConfig( ImplConfigData* pData )
{
-#ifdef DBG_UTIL
-if ( DbgIsAssert() )
-{
-if ( pData-mnTimeStamp != ImplSysGetConfigTimeStamp(
pData-maFileName ) )
-{
-OSL_TRACE( Config overwrites modified configfile:\n %s,
rtl::OUStringToOString(pData-maFileName, RTL_TEXTENCODING_UTF8).getStr() );
-}
-}
-#endif
+SAL_WARN_IF( pData-mnTimeStamp != ImplSysGetConfigTimeStamp(
pData-maFileName ),
+tools.generic, Config overwrites modified configfile:
pData-maFileName );
// Read config list from buffer
sal_uIntPtr nBufLen;
diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx
index 261c4d0..653dac9 100644
--- a/vcl/source/window/accel.cxx
+++ b/vcl/source/window/accel.cxx
@@ -264,7 +264,7 @@
}
else if ( !mpData-maKeyMap.insert( std::make_pair( nCode, pEntry )
).second )
{
-OSL_TRACE( Accelerator::InsertItem(): KeyCode (Key: %lx) already
exists, nCode );
+SAL_WARN( vcl.layout, Accelerator::InsertItem(): KeyCode (Key:
nCode ) already exists );
delete pEntry;
}
else
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index b8f1cde..98c856b 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -2661,7 +2661,7 @@
break;
#ifdef DBG_UTIL
default:
-OSL_TRACE( ImplWindowFrameProc(): unknown event (%lu),
(sal_uLong)nEvent );
+SAL_WARN( vcl.layout, ImplWindowFrameProc(): unknown event (
nEvent ) );
break;
#endif
}
--
To view, visit https://gerrit.libreoffice.org/2900
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id:
[PUSHED] Comment translation GER-ENG in sw/source/ui/wrtsh/
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2902 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2902 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iab8f8e7c6269607ac2f0f0acdbd1200f917eaaf5 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Comment translation - GER-ENG in sw/source/ui/wrtsh/wrtsh1.c...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2883 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2883 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I83bca633e1b6ea91ac5fa16aefb7e4a1c285e925 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de Gerrit-Reviewer: Chris Sherlock chris.sherloc...@gmail.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] this looks better
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2874 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/74/2874/1 this looks better Change-Id: I10af9ff8513f8f583867d0d6a18af03b3b5b1a28 --- M cppuhelper/inc/cppuhelper/propertysetmixin.hxx 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cppuhelper/inc/cppuhelper/propertysetmixin.hxx b/cppuhelper/inc/cppuhelper/propertysetmixin.hxx index 15bf836..68c9855 100644 --- a/cppuhelper/inc/cppuhelper/propertysetmixin.hxx +++ b/cppuhelper/inc/cppuhelper/propertysetmixin.hxx @@ -18,8 +18,7 @@ */ #ifndef INCLUDED_CPPUHELPER_PROPERTYSETMIXIN_HXX -#define INCLUDED_CPPUHELPER_PROPERTYSETMIXIN_HXX \ -INCLUDED_CPPUHELPER_PROPERTYSETMIXIN_HXX +#define INCLUDED_CPPUHELPER_PROPERTYSETMIXIN_HXX #include sal/config.h #include com/sun/star/beans/PropertyVetoException.hpp -- To view, visit https://gerrit.libreoffice.org/2874 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I10af9ff8513f8f583867d0d6a18af03b3b5b1a28 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted ...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2832 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2832 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idf28320817cdcbea6d0f7ec06a9bf51bd2c3b3ec Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Thomas Arnhold tho...@arnhold.org Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings ...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2835 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/35/2835/1 removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings declarations s/(OUString\s+[a-zA-Z_][A-Za-z0-9_]*\s*)\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*[^)]*?\s*)\)\s*\)/$1\($2\)/gms Change-Id: Iad20f242c80c4bdc69df17e2d7a69d58ea53654b --- M bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx M bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx M bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx M bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx M bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx M bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx M bridges/test/java_uno/acquire/testacquire.cxx M bridges/test/java_uno/equals/testequals.cxx M bridges/test/performance/testperformance.cxx M bridges/test/testcomp.cxx M cli_ure/source/uno_bridge/cli_data.cxx M connectivity/source/commontools/AutoRetrievingBase.cxx M connectivity/source/commontools/ConnectionWrapper.cxx M connectivity/source/commontools/DateConversion.cxx M connectivity/source/commontools/DriversConfig.cxx M connectivity/source/commontools/FValue.cxx M connectivity/source/commontools/TColumnsHelper.cxx M connectivity/source/commontools/TIndexColumns.cxx M connectivity/source/commontools/TIndexes.cxx M connectivity/source/commontools/TTableHelper.cxx M connectivity/source/commontools/conncleanup.cxx M connectivity/source/commontools/dbconversion.cxx M connectivity/source/commontools/dbtools.cxx M connectivity/source/commontools/dbtools2.cxx M connectivity/source/commontools/parameters.cxx M connectivity/source/commontools/predicateinput.cxx M connectivity/source/commontools/sqlerror.cxx M connectivity/source/commontools/statementcomposer.cxx M connectivity/source/cpool/ZConnectionPool.cxx M connectivity/source/drivers/ado/AConnection.cxx M connectivity/source/drivers/ado/APreparedStatement.cxx M connectivity/source/drivers/ado/Awrapado.cxx M connectivity/source/drivers/hsqldb/HCatalog.cxx M connectivity/source/drivers/jdbc/JConnection.cxx M connectivity/source/drivers/mozab/MConfigAccess.cxx M connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx M connectivity/source/drivers/mysql/YCatalog.cxx M connectivity/source/drivers/postgresql/pq_connection.cxx M connectivity/source/drivers/postgresql/pq_driver.cxx M cppu/qa/test_any.cxx M cppu/source/threadpool/current.cxx M cppu/source/typelib/static_types.cxx M cppu/source/uno/cascade_mapping.cxx M cppuhelper/source/tdmgr.cxx M cppuhelper/test/cfg_test.cxx M cppuhelper/test/testcmp/TestComponent.cxx M cpputools/source/unoexe/unoexe.cxx M crashrep/source/win32/soreport.cxx M cui/source/dialogs/colorpicker.cxx M cui/source/dialogs/cuigaldlg.cxx M cui/source/dialogs/hlmarkwn.cxx M dbaccess/qa/extras/macros-test.cxx M dbaccess/source/ui/control/FieldDescControl.cxx M dbaccess/source/ui/dlg/CollectionView.cxx M dbaccess/source/ui/dlg/ConnectionHelper.cxx M dbaccess/source/ui/dlg/dbfindex.cxx M dbaccess/source/ui/dlg/odbcconfig.cxx M dbaccess/source/ui/dlg/queryfilter.cxx M dbaccess/source/ui/dlg/queryorder.cxx M dbaccess/source/ui/dlg/tablespage.cxx M dbaccess/source/ui/misc/DExport.cxx M dbaccess/source/ui/misc/UITools.cxx M dbaccess/source/ui/misc/WCPage.cxx M dbaccess/source/ui/misc/WCopyTable.cxx M dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx M dbaccess/source/ui/querydesign/QueryDesignView.cxx M dbaccess/source/ui/querydesign/querycontainerwindow.cxx M dbaccess/source/ui/tabledesign/TableController.cxx M dbaccess/source/ui/uno/ColumnPeer.cxx M drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx M drawinglayer/source/geometry/viewinformation2d.cxx M drawinglayer/source/geometry/viewinformation3d.cxx M editeng/source/items/flditem.cxx M editeng/source/misc/unolingu.cxx M editeng/source/uno/unotext.cxx M editeng/source/xml/xmltxtexp.cxx M editeng/source/xml/xmltxtimp.cxx M embeddedobj/source/commonembedding/persistence.cxx M
[PUSHED] removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings ...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2835 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2835 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iad20f242c80c4bdc69df17e2d7a69d58ea53654b Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Thomas Arnhold tho...@arnhold.org Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#38838, String to OUString, in dbaccess/source/ui/browser
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2538 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2538 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8a565cdae7fd9da1de05525c602ce011542ab4d5 Gerrit-PatchSet: 10 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Gergő Mocsi gmocs...@gmail.com Gerrit-Reviewer: Eike Rathke er...@redhat.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#38838, String to OUString in dbaccess
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2386 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2386 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie385d44c328fb3f919d53a604d51640a334a1013 Gerrit-PatchSet: 5 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Gergő Mocsi gmocs...@gmail.com Gerrit-Reviewer: Muthu Subramanian K muthus...@gmail.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
