[Libreoffice-commits] .: Makefile
Makefile |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ef5b4b577c407ab5dc1595a1865f710a14e1bdee Author: Stephan Bergmann sberg...@redhat.com Date: Tue Mar 27 08:16:19 2012 +0200 dev-install needs to depend on build after all ...as only build passes through instsetoo_native, where some files (pyuno.py etc.) are copied into places where ooinstall expects to find them. diff --git a/Makefile b/Makefile index 4386267..d29f244 100644 --- a/Makefile +++ b/Makefile @@ -430,7 +430,7 @@ install: echo Installation finished, you can now execute: \ echo $(INSTALLDIR)/program/soffice -dev-install: build-packimages +dev-install: build @rm -rf $(OUTDIR)/installation @mkdir $(OUTDIR)/installation ifeq ($(DISABLE_LINKOO),TRUE) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/CppunitTest_sc_subsequent_filters_test.mk
sc/CppunitTest_sc_subsequent_filters_test.mk |3 +++ 1 file changed, 3 insertions(+) New commits: commit 31d0dcfa76cc89afb214304dae556226f490421f Author: Tor Lillqvist tlillqv...@suse.com Date: Tue Mar 27 09:42:41 2012 +0300 qahelper.hxx's loadFile() needs liblo-bootstrap on Android diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk index 7cf779f..bc79f90 100644 --- a/sc/CppunitTest_sc_subsequent_filters_test.mk +++ b/sc/CppunitTest_sc_subsequent_filters_test.mk @@ -63,6 +63,9 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sc_subsequent_filters_test, \ utl \ vcl \ xo \ + $(if $(filter $(OS),ANDROID), \ + lo-bootstrap \ + ) \ $(gb_STDLIBS) \ )) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - basctl/AllLangResTarget_basctl.mk formula/AllLangResTarget_for.mk svl/AllLangResTarget_svl.mk svl/Library_fsstorage.mk svl/Library_passw
basctl/AllLangResTarget_basctl.mk |4 formula/AllLangResTarget_for.mk |1 + svl/AllLangResTarget_svl.mk |2 +- svl/Library_fsstorage.mk |7 ++- svl/Library_passwordcontainer.mk |7 ++- 5 files changed, 10 insertions(+), 11 deletions(-) New commits: commit 3d07ac27bf35f83587fd5422791adf6670c689a1 Author: Matúš Kukan matus.ku...@gmail.com Date: Sun Mar 25 12:18:32 2012 +0200 svl: add include path and more add_package_headers Conflicts: svl/AllLangResTarget_svl.mk svl/Library_fsstorage.mk svl/Library_passwordcontainer.mk Signed-off-by: LuboÅ¡ LuÅák l.lu...@suse.cz diff --git a/svl/AllLangResTarget_svl.mk b/svl/AllLangResTarget_svl.mk index 70edac2..90cb015 100644 --- a/svl/AllLangResTarget_svl.mk +++ b/svl/AllLangResTarget_svl.mk @@ -36,7 +36,7 @@ $(eval $(call gb_SrsTarget_SrsTarget,svl/res)) $(eval $(call gb_SrsTarget_set_include,svl/res,\ $$(INCLUDE) \ --I$(WORKDIR)/inc \ +-I$(realpath $(SRCDIR)/svl/inc) \ )) $(eval $(call gb_SrsTarget_add_files,svl/res,\ diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk index 2247c9a..a3bf09f 100644 --- a/svl/Library_fsstorage.mk +++ b/svl/Library_fsstorage.mk @@ -28,15 +28,12 @@ $(eval $(call gb_Library_Library,fsstorage)) +$(eval $(call gb_Library_add_package_headers,fsstorage,svl_inc)) + $(eval $(call gb_Library_set_componentfile,fsstorage,svl/source/fsstor/fsstorage)) $(eval $(call gb_Library_set_include,fsstorage,\ --I$(WORKDIR)/inc/svl \ --I$(WORKDIR)/inc/ \ --I$(realpath $(SRCDIR)/svl/inc) \ --I$(realpath $(SRCDIR)/svl/inc/svl) \ -I$(realpath $(SRCDIR)/svl/source/inc) \ --I$(OUTDIR)/inc \ $$(INCLUDE) \ )) diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk index 6b577b6..e96a11a 100644 --- a/svl/Library_passwordcontainer.mk +++ b/svl/Library_passwordcontainer.mk @@ -28,15 +28,12 @@ $(eval $(call gb_Library_Library,passwordcontainer)) +$(eval $(call gb_Library_add_package_headers,passwordcontainer,svl_inc)) + $(eval $(call gb_Library_set_componentfile,passwordcontainer,svl/source/passwordcontainer/passwordcontainer)) $(eval $(call gb_Library_set_include,passwordcontainer,\ --I$(WORKDIR)/inc/svl \ --I$(WORKDIR)/inc/ \ --I$(realpath $(SRCDIR)/svl/inc) \ --I$(realpath $(SRCDIR)/svl/inc/svl) \ -I$(realpath $(SRCDIR)/svl/source/inc) \ --I$(OUTDIR)/inc \ $$(INCLUDE) \ )) commit a0d31721fc2cd7391e7a27a3adcf50ff20370174 Author: Matúš Kukan matus.ku...@gmail.com Date: Mon Mar 26 23:01:46 2012 +0200 more dependencies and include paths Conflicts: basctl/AllLangResTarget_basctl.mk formula/AllLangResTarget_for.mk Signed-off-by: LuboÅ¡ LuÅák l.lu...@suse.cz diff --git a/basctl/AllLangResTarget_basctl.mk b/basctl/AllLangResTarget_basctl.mk index 1611f9a..63575fa 100644 --- a/basctl/AllLangResTarget_basctl.mk +++ b/basctl/AllLangResTarget_basctl.mk @@ -54,4 +54,8 @@ $(eval $(call gb_SrsTarget_add_files,basctl/res,\ basctl/source/dlged/managelang.src \ )) +$(call gb_SrsTemplateTarget_get_target,basctl/res) : \ + $(call gb_Package_get_target,svx_globlmn_hrc) \ + $(call gb_Package_get_target,svx_inc) + # vim: set noet sw=4 ts=4: diff --git a/formula/AllLangResTarget_for.mk b/formula/AllLangResTarget_for.mk index 0830623..fe90dd6 100644 --- a/formula/AllLangResTarget_for.mk +++ b/formula/AllLangResTarget_for.mk @@ -37,6 +37,7 @@ $(eval $(call gb_SrsTarget_SrsTarget,formula/res)) $(eval $(call gb_SrsTarget_set_include,formula/res,\ $$(INCLUDE) \ +-I$(realpath $(SRCDIR)/formula/inc) \ -I$(realpath $(SRCDIR)/formula/source/core/inc) \ -I$(OUTDIR)/inc \ )) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - cui/source
cui/source/tabpages/tpline.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 14d47f6f6ed9f9e682136cc72d6fe44a9e0c7d9e
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Mon Mar 26 16:26:32 2012 -0400
fdo#46942: Fix a regression caused by List removal.
3236c2c3af9355157c62f68fcbd429498f7f747b accidentally removed the gallery
item count which was used to differentiate the gallery symbols from
normal ones.
Signed-off-by: Stephan Bergmann sberg...@redhat.com
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 3a27eaa..abb5df3 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -1464,6 +1464,7 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton
*, pButton )
String aEmptyStr;
const String *pUIName = NULL;
sal_uInt32 i = 0;
+nNumMenuGalleryItems = aGrfNames.size();
for(std::vectorString::iterator it = aGrfNames.begin(); it !=
aGrfNames.end(); ++it, ++i)
{
pUIName = (*it);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-2' - sw/source
sw/source/core/layout/paintfrm.cxx | 44 +
1 file changed, 11 insertions(+), 33 deletions(-)
New commits:
commit 47ef805d8ab2f2a41be058ab5f7e0fe061ffe7a0
Author: Petr Mladek pmla...@suse.cz
Date: Tue Mar 27 10:04:38 2012 +0200
Revert fdo#42750: delay painting borders until after subsidiary lines
It still causes some regressions and it is more safe to be on the state
of 3.5.1.
This reverts commit c7524ab32f801910673da5c9c68669ada7c98769.
Signed-off-by: Petr Mladek pmla...@suse.cz
Signed-off-by: Michael Stahl mst...@redhat.com
Signed-off-by: Cedric Bosdonnat cbosdon...@suse.com
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 3a93e47..4de8650 100755
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -119,7 +119,6 @@
#include drawinglayer/primitive2d/textlayoutdevice.hxx
#include svx/sdr/contact/objectcontacttools.hxx
#include svx/unoapi.hxx
-#include comphelper/sequenceasvector.hxx
#include basegfx/matrix/b2dhommatrix.hxx
#include basegfx/matrix/b2dhommatrixtools.hxx
#include basegfx/polygon/b2dpolygon.hxx
@@ -221,22 +220,6 @@ public:
inline void Ins( const SwRect rRect, const sal_uInt8 nSCol );
};
-class BorderLines
-{
-::comphelper::SequenceAsVector
- ::drawinglayer::primitive2d::Primitive2DReference m_Lines;
-public:
-void AddBorderLine(
-::drawinglayer::primitive2d::Primitive2DReference const xLine)
-{
-m_Lines.push_back(xLine);
-}
-drawinglayer::primitive2d::Primitive2DSequence GetBorderLines() const
-{
-return m_Lines.getAsConstList();
-}
-};
-
//- End of classes for border lines --
static ViewShell *pGlobalShell = 0;
@@ -270,7 +253,6 @@ static double aEdgeScale = 0.5;
// be compared with pLines before the work in order to avoid help lines
// to hide borders.
// bTablines is sal_True during the Paint of a table.
-static BorderLines *g_pBorderLines = 0;
static SwLineRects *pLines = 0;
static SwSubsRects *pSubsLines = 0;
// global variable for sub-lines of body, header, footer, section and footnote
frames.
@@ -353,7 +335,6 @@ class SwSavePaintStatics
SwFlyFrm *pSRetoucheFly,
*pSRetoucheFly2,
*pSFlyOnlyDraw;
-BorderLines*pBLines;
SwLineRects*pSLines;
SwSubsRects*pSSubsLines;
SwSubsRects*pSSpecSubsLines;
@@ -379,7 +360,6 @@ SwSavePaintStatics::SwSavePaintStatics() :
pSRetoucheFly ( pRetoucheFly ),
pSRetoucheFly2 ( pRetoucheFly2 ),
pSFlyOnlyDraw ( pFlyOnlyDraw ),
-pBLines ( g_pBorderLines),
pSLines ( pLines),
pSSubsLines ( pSubsLines),
pSSpecSubsLines ( pSpecSubsLines),
@@ -404,7 +384,6 @@ SwSavePaintStatics::SwSavePaintStatics() :
aScaleX = aScaleY = 1.0;
aMinDistScale = 0.73;
aEdgeScale = 0.5;
-g_pBorderLines = 0;
pLines = 0;
pSubsLines = 0;
pSpecSubsLines = 0L;
@@ -419,7 +398,6 @@ SwSavePaintStatics::~SwSavePaintStatics()
pRetoucheFly = pSRetoucheFly;
pRetoucheFly2 = pSRetoucheFly2;
pFlyOnlyDraw = pSFlyOnlyDraw;
-g_pBorderLines = pBLines;
pLines = pSLines;
pSubsLines = pSSubsLines;
pSpecSubsLines = pSSpecSubsLines;
@@ -2910,7 +2888,6 @@ SwRootFrm::Paint(SwRect const rRect, SwPrintData
const*const pPrintData) const
pSubsLines = new SwSubsRects;
pSpecSubsLines = new SwSubsRects;
}
-g_pBorderLines = new BorderLines;
aPaintRect._Intersection( aRect );
@@ -3024,9 +3001,6 @@ SwRootFrm::Paint(SwRect const rRect, SwPrintData
const*const pPrintData) const
DELETEZ( pSubsLines );
DELETEZ( pSpecSubsLines );
}
-// fdo#42750: delay painting these until after subsidiary lines
-ProcessPrimitives(g_pBorderLines-GetBorderLines());
-DELETEZ(g_pBorderLines);
pVout-Leave();
// #i68597#
@@ -4535,8 +4509,11 @@ void lcl_PaintLeftRightLine( const sal_Bool
_bLeft,
::lcl_SubTopBottom( aRect, rBox, _rAttrs, _rFrm, _rRectFn,
bPrtOutputDev );
}
+// TODO Postpone the processing of the primitives
if ( lcl_GetLineWidth( pLeftRightBorder ) 0 )
{
+drawinglayer::primitive2d::Primitive2DSequence aSequence( 1 );
+
double nExtentIS = lcl_GetExtent( pTopBorder, NULL );
double nExtentIE = lcl_GetExtent( pBottomBorder, NULL );
double nExtentOS = lcl_GetExtent( NULL, pTopBorder );
@@ -4558,22 +4535,21 @@ void lcl_PaintLeftRightLine( const sal_Bool
_bLeft,
Color aLeftColor = _bLeft ?
[Libreoffice-commits] .: connectivity/source
connectivity/source/commontools/dbtools2.cxx | 73 ++-
1 file changed, 62 insertions(+), 11 deletions(-)
New commits:
commit 077e711b5f5f19fceed44e2d992bf5c027e75ab6
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Tue Mar 27 10:49:49 2012 +0200
fdo#47937: copy column privileges into table privileges
diff --git a/connectivity/source/commontools/dbtools2.cxx
b/connectivity/source/commontools/dbtools2.cxx
index e559847..1ad8985 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -674,19 +674,20 @@ sal_Int32 getTablePrivileges(const Reference
XDatabaseMetaData _xMetaData,
Reference XResultSet xPrivileges =
_xMetaData-getTablePrivileges(aVal, _sSchema, _sTable);
Reference XRow xCurrentRow(xPrivileges, UNO_QUERY);
+const ::rtl::OUString sUserWorkingFor = _xMetaData-getUserName();
+static const ::rtl::OUString sSELECT( RTL_CONSTASCII_USTRINGPARAM(
SELECT ));
+static const ::rtl::OUString sINSERT( RTL_CONSTASCII_USTRINGPARAM(
INSERT ));
+static const ::rtl::OUString sUPDATE( RTL_CONSTASCII_USTRINGPARAM(
UPDATE ));
+static const ::rtl::OUString sDELETE( RTL_CONSTASCII_USTRINGPARAM(
DELETE ));
+static const ::rtl::OUString sREAD( RTL_CONSTASCII_USTRINGPARAM(
READ ));
+static const ::rtl::OUString sCREATE( RTL_CONSTASCII_USTRINGPARAM(
CREATE ));
+static const ::rtl::OUString sALTER( RTL_CONSTASCII_USTRINGPARAM(
ALTER ));
+static const ::rtl::OUString sREFERENCE( RTL_CONSTASCII_USTRINGPARAM(
REFERENCE ));
+static const ::rtl::OUString sDROP( RTL_CONSTASCII_USTRINGPARAM(
DROP ));
+
if ( xCurrentRow.is() )
{
-::rtl::OUString sUserWorkingFor = _xMetaData-getUserName();
-static const ::rtl::OUString sSELECT( RTL_CONSTASCII_USTRINGPARAM(
SELECT ));
-static const ::rtl::OUString sINSERT( RTL_CONSTASCII_USTRINGPARAM(
INSERT ));
-static const ::rtl::OUString sUPDATE( RTL_CONSTASCII_USTRINGPARAM(
UPDATE ));
-static const ::rtl::OUString sDELETE( RTL_CONSTASCII_USTRINGPARAM(
DELETE ));
-static const ::rtl::OUString sREAD( RTL_CONSTASCII_USTRINGPARAM(
READ ));
-static const ::rtl::OUString sCREATE( RTL_CONSTASCII_USTRINGPARAM(
CREATE ));
-static const ::rtl::OUString sALTER( RTL_CONSTASCII_USTRINGPARAM(
ALTER ));
-static const ::rtl::OUString sREFERENCE(
RTL_CONSTASCII_USTRINGPARAM( REFERENCE ));
-static const ::rtl::OUString sDROP( RTL_CONSTASCII_USTRINGPARAM(
DROP ));
-// after creation the set is positioned before the first record,
per definitionem
+// after creation the set is positioned before the first record,
per definition
#ifdef DBG_UTIL
Reference XResultSetMetaDataSupplier
xSup(xPrivileges,UNO_QUERY);
if ( xSup.is() )
@@ -743,6 +744,56 @@ sal_Int32 getTablePrivileges(const Reference
XDatabaseMetaData _xMetaData,
}
}
disposeComponent(xPrivileges);
+
+// Some drivers put a table privilege as soon as any column has the
privilege,
+// some drivers only if all columns have the privilege.
+// To unifiy the situation, collect column privileges here, too.
+Reference XResultSet xColumnPrivileges =
_xMetaData-getColumnPrivileges(aVal, _sSchema, _sTable,
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(%)));
+Reference XRow xColumnCurrentRow(xColumnPrivileges, UNO_QUERY);
+if ( xColumnCurrentRow.is() )
+{
+// after creation the set is positioned before the first record,
per definition
+::rtl::OUString sPrivilege, sGrantee;
+while ( xColumnPrivileges-next() )
+{
+#ifdef DBG_UTIL
+::rtl::OUString sCat, sSchema, sTableName, sColumnName,
sGrantor, sGrantable;
+sCat= xColumnCurrentRow-getString(1);
+sSchema = xColumnCurrentRow-getString(2);
+sTableName = xColumnCurrentRow-getString(3);
+sColumnName = xColumnCurrentRow-getString(4);
+sGrantor= xColumnCurrentRow-getString(5);
+#endif
+sGrantee= xColumnCurrentRow-getString(6);
+sPrivilege = xColumnCurrentRow-getString(7);
+#ifdef DBG_UTIL
+sGrantable = xColumnCurrentRow-getString(8);
+#endif
+
+if (!sUserWorkingFor.equalsIgnoreAsciiCase(sGrantee))
+continue;
+
+if (sPrivilege.equalsIgnoreAsciiCase(sSELECT))
+nPrivileges |= Privilege::SELECT;
+else if (sPrivilege.equalsIgnoreAsciiCase(sINSERT))
+nPrivileges |= Privilege::INSERT;
+else if (sPrivilege.equalsIgnoreAsciiCase(sUPDATE))
+nPrivileges |= Privilege::UPDATE;
+else if
[Libreoffice-commits] .: Branch 'libreoffice-3-5-2' - 3 commits - scripting/examples scripting/Jar_HelloWorld.mk scripting/Jar_Highlight.mk scripting/Jar_MemoryUsage.mk scripting/Jar_ScriptFramework.m
scripting/Jar_HelloWorld.mk |2 scripting/Jar_Highlight.mk |2 scripting/Jar_MemoryUsage.mk |2 scripting/Jar_ScriptFramework.mk |2 scripting/Jar_ScriptProviderForBeanShell.mk |4 scripting/Jar_ScriptProviderForJava.mk |5 + scripting/Jar_ScriptProviderForJavaScript.mk |2 scripting/examples/java/HelloWorld/HelloWorld.java |2 scripting/examples/java/HelloWorld/parcel-descriptor.xml |2 scripting/examples/java/Highlight/HighlightText.java |2 scripting/examples/java/Highlight/parcel-descriptor.xml |2 scripting/examples/java/MemoryUsage/MemoryUsage.java |2 scripting/examples/java/MemoryUsage/parcel-descriptor.xml |2 scripting/examples/java/Newsgroup/MimeConfiguration.java |2 scripting/examples/java/Newsgroup/NewsGroup.java |2 scripting/examples/java/Newsgroup/OfficeAttachment.java |2 scripting/examples/java/Newsgroup/PostNewsgroup.java |2 scripting/examples/java/Newsgroup/Sender.java |2 scripting/examples/java/Newsgroup/StatusWindow.java |2 scripting/examples/java/Newsgroup/SubscribedNewsgroups.java |2 scripting/examples/java/debugger/DebugRunner.java |2 scripting/examples/java/debugger/OOBeanShellDebugger.java |2 scripting/examples/java/debugger/OORhinoDebugger.java |2 scripting/examples/java/debugger/OOScriptDebugger.java |2 scripting/examples/java/debugger/parcel-descriptor.xml |2 scripting/examples/java/selector/ScriptSelector.java |2 scripting/examples/java/selector/parcel-descriptor.xml |2 scripting/java/Framework/MANIFEST.MF |2 scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java | 46 +- scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java |6 - scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java |3 scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java |3 scripting/java/com/sun/star/script/framework/provider/java/MANIFEST.MF |2 scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java |2 scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java |3 35 files changed, 109 insertions(+), 17 deletions(-) New commits: commit a574a38a73b252498ac061dcf08d96a84b48b6af Author: Stephan Bergmann sberg...@redhat.com Date: Fri Mar 23 16:05:24 2012 +0100 fdo#46102: Load Java scripts with class loaders that actually find them ScriptMetaData.createURL produces weird URLs (ending in /ucb/, and potentially still containing vnd.sun.star.expand: prefix) that are apparently good for loading documents for editing via UCBStreamHandler, but cannot meaningfully be passed to a URLClassLoader. It is unclear to me how the Java script provider shall ever have found the script jars in the past. (cherry picked from commit dd6c4f4db1d62268d73e09ae52d23f760a967dcc) Signed-off-by: Michael Stahl mst...@redhat.com Signed-off-by: Petr Mladek pmla...@suse.cz Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch diff --git a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java index 1cf99d7..178f480 100755 --- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java +++
[Libreoffice-commits] .: officecfg/util
officecfg/util/schema_val.xsl |1 - 1 file changed, 1 deletion(-) New commits: commit b0ba1438439873b1da3a9d580e9828ebae11bad4 Author: Tor Lillqvist t...@iki.fi Date: Tue Mar 27 12:51:47 2012 +0300 Bin annoying CHECKING CONSISTENCY message diff --git a/officecfg/util/schema_val.xsl b/officecfg/util/schema_val.xsl index f8147d8..04342e7 100755 --- a/officecfg/util/schema_val.xsl +++ b/officecfg/util/schema_val.xsl @@ -41,7 +41,6 @@ xsl:param name=componentName/ xsl:template match = / - xsl:message terminate=noCHECKING CONSISTENCY .../xsl:message xsl:apply-templates/ /xsl:template ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - offapi/type_reference udkapi/com
offapi/type_reference/types.rdb |binary
udkapi/com/sun/star/beans/Introspection.idl |7 +--
udkapi/com/sun/star/registry/ImplementationRegistration.idl |6 +-
udkapi/com/sun/star/registry/SimpleRegistry.idl |7 +--
udkapi/com/sun/star/script/AllListenerAdapter.idl |5 +
udkapi/com/sun/star/script/Invocation.idl |7 +--
udkapi/com/sun/star/security/AccessController.idl |5 +
udkapi/com/sun/star/security/Policy.idl |5 +
udkapi/com/sun/star/uno/NamingService.idl |8 +---
9 files changed, 8 insertions(+), 42 deletions(-)
New commits:
commit fd065e692a7355ffc46bf42a9ec1f3743ba8310c
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Mar 27 11:47:17 2012 +0200
Remove superfluous comment
...that looks out of place after previous commit.
diff --git a/udkapi/com/sun/star/uno/NamingService.idl
b/udkapi/com/sun/star/uno/NamingService.idl
index 38b7239..a67bdd1 100644
--- a/udkapi/com/sun/star/uno/NamingService.idl
+++ b/udkapi/com/sun/star/uno/NamingService.idl
@@ -34,7 +34,6 @@
//=
/** a simple named object container.
-Through this interface the objects are registered and accessed.
*/
published service NamingService : com::sun::star::uno::XNamingService;
commit e4d9dabce80e7823bcdf28f06a99c83a2950d8c7
Author: Noel Grandin n...@peralex.com
Date: Mon Mar 26 15:05:46 2012 +0200
fdo#46808, Adapt UNO serviecs to new style, Part 1
Convert the IDL files in the udkapi module, and update the
types.rdb database.
Signed-off-by: Stephan Bergmann sberg...@redhat.com
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index 19ad36b..8e35e75 100644
Binary files a/offapi/type_reference/types.rdb and
b/offapi/type_reference/types.rdb differ
diff --git a/udkapi/com/sun/star/beans/Introspection.idl
b/udkapi/com/sun/star/beans/Introspection.idl
index 0e93138..1f6d011 100644
--- a/udkapi/com/sun/star/beans/Introspection.idl
+++ b/udkapi/com/sun/star/beans/Introspection.idl
@@ -45,12 +45,7 @@
pFor details see method memberXIntrospection::inspect
/member./p
*/
-published service Introspection
-{
-/// The only interface of this service
-interface com::sun::star::beans::XIntrospection;
-
-};
+published service Introspection : com::sun::star::beans::XIntrospection;
//=
diff --git a/udkapi/com/sun/star/registry/ImplementationRegistration.idl
b/udkapi/com/sun/star/registry/ImplementationRegistration.idl
index 03a365e..f925a2a 100644
--- a/udkapi/com/sun/star/registry/ImplementationRegistration.idl
+++ b/udkapi/com/sun/star/registry/ImplementationRegistration.idl
@@ -49,11 +49,7 @@
/ul
*/
published service ImplementationRegistration
-{
-// DocMerge: empty anyway
-interface com::sun::star::registry::XImplementationRegistration;
-
-};
+ : com::sun::star::registry::XImplementationRegistration;
//=
diff --git a/udkapi/com/sun/star/registry/SimpleRegistry.idl
b/udkapi/com/sun/star/registry/SimpleRegistry.idl
index b4b8e5a..fbe06d9 100644
--- a/udkapi/com/sun/star/registry/SimpleRegistry.idl
+++ b/udkapi/com/sun/star/registry/SimpleRegistry.idl
@@ -46,12 +46,7 @@
li-thread safe/li
/ul
*/
-published service SimpleRegistry
-{
-// DocMerge: empty anyway
-interface com::sun::star::registry::XSimpleRegistry;
-
-};
+published service SimpleRegistry : com::sun::star::registry::XSimpleRegistry;
//=
diff --git a/udkapi/com/sun/star/script/AllListenerAdapter.idl
b/udkapi/com/sun/star/script/AllListenerAdapter.idl
index b98db50..f454c12 100644
--- a/udkapi/com/sun/star/script/AllListenerAdapter.idl
+++ b/udkapi/com/sun/star/script/AllListenerAdapter.idl
@@ -40,10 +40,7 @@
interfaces to the interface typeXAllListener/type.
*/
published service AllListenerAdapter
-{
-/// interface to create adapters for listener types
-interface com::sun::star::script::XAllListenerAdapterService;
-};
+: com::sun::star::script::XAllListenerAdapterService;
//=
diff --git a/udkapi/com/sun/star/script/Invocation.idl
b/udkapi/com/sun/star/script/Invocation.idl
index 92ef143..a72f7a6 100644
--- a/udkapi/com/sun/star/script/Invocation.idl
+++ b/udkapi/com/sun/star/script/Invocation.idl
@@ -46,12 +46,7 @@
The adapter may also support type
scope=com::sun::star::scriptXInvocation2/type.
/p
*/
-published service Invocation
-{
-/// Interface to specify the object to be mapped by the invocation service.
-
[Libreoffice-commits] .: Branch 'libreoffice-3-5-2' - cui/source
cui/source/tabpages/tpline.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 12d4ad922bce712d72c52e5ef9cd5e7b5e74fe73
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Mon Mar 26 16:26:32 2012 -0400
fdo#46942: Fix a regression caused by List removal.
3236c2c3af9355157c62f68fcbd429498f7f747b accidentally removed the gallery
item count which was used to differentiate the gallery symbols from
normal ones.
Signed-off-by: Stephan Bergmann sberg...@redhat.com
Signed-off-by: Noel Power nopo...@suse.com
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 3a27eaa..abb5df3 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -1464,6 +1464,7 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton
*, pButton )
String aEmptyStr;
const String *pUIName = NULL;
sal_uInt32 i = 0;
+nNumMenuGalleryItems = aGrfNames.size();
for(std::vectorString::iterator it = aGrfNames.begin(); it !=
aGrfNames.end(); ++it, ++i)
{
pUIName = (*it);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sfx2/source
sfx2/source/dialog/filedlghelper.cxx | 23 +++
sfx2/source/dialog/filedlgimpl.hxx |2 ++
2 files changed, 25 insertions(+)
New commits:
commit dd2fe95cce75f1157bd1c75d286a0047b2e4175e
Author: Andrzej J. R. Hunt andr...@hunt.org
Date: Tue Mar 27 10:32:52 2012 +0200
fdo#43895 lp#905355: Never let users save in /tmp by default
diff --git a/sfx2/source/dialog/filedlghelper.cxx
b/sfx2/source/dialog/filedlghelper.cxx
index 3bf4fb5..0018912 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -101,6 +101,9 @@
#include sfxlocal.hrc
#include rtl/oustringostreaminserter.hxx
#include rtl/strbuf.hxx
+#ifdef UNX
+#include sys/stat.h
+#endif
//-
@@ -1635,6 +1638,24 @@ void FileDialogHelper_Impl::getRealFilter( String
_rFilter ) const
}
}
+void FileDialogHelper_Impl::verifyPath()
+{
+#ifdef UNX
+struct stat aFileStat;
+const OString sFullPath = OUStringToOString(
maPath.copy(RTL_CONSTASCII_LENGTH(file://)) + maFileName,
osl_getThreadTextEncoding() );
+stat( sFullPath.getStr(), aFileStat );
+// lp#905355, fdo#43895
+// Check that the file has read only permission and is in /tmp -- this is
+// the case if we have opened the file from the web with firefox only.
+if ( maPath.reverseCompareToAsciiL(file:///tmp,11) == 0
+( aFileStat.st_mode (S_IRWXO + S_IRWXG + S_IRWXU) ) == S_IRUSR )
+{
+maPath = SvtPathOptions().GetWorkPath();
+mxFileDlg-setDisplayDirectory( maPath );
+}
+#endif
+}
+
//
void FileDialogHelper_Impl::displayFolder( const ::rtl::OUString _rPath )
{
@@ -1648,6 +1669,7 @@ void FileDialogHelper_Impl::displayFolder( const
::rtl::OUString _rPath )
try
{
mxFileDlg-setDisplayDirectory( maPath );
+verifyPath();
}
catch( const IllegalArgumentException )
{
@@ -1665,6 +1687,7 @@ void FileDialogHelper_Impl::setFileName( const
::rtl::OUString _rFile )
try
{
mxFileDlg-setDefaultName( maFileName );
+verifyPath();
}
catch( const IllegalArgumentException )
{
diff --git a/sfx2/source/dialog/filedlgimpl.hxx
b/sfx2/source/dialog/filedlgimpl.hxx
index 4f4e86d..4c3c68b 100644
--- a/sfx2/source/dialog/filedlgimpl.hxx
+++ b/sfx2/source/dialog/filedlgimpl.hxx
@@ -152,6 +152,8 @@ namespace sfx2
voidimplInitializeFileName( );
+voidverifyPath( );
+
voidimplGetAndCacheFiles( const
::com::sun::star::uno::Reference XInterface xPicker ,
std::vectorrtl::OUString rpURLList,
const SfxFilter*
pFilter );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/inc sc/source
sc/inc/attarray.hxx|2 +-
sc/inc/column.hxx |2 +-
sc/inc/document.hxx|1 +
sc/inc/table.hxx |2 +-
sc/source/core/data/attarray.cxx |4 ++--
sc/source/core/data/column2.cxx|4 ++--
sc/source/core/data/document.cxx | 13 +
sc/source/core/data/table1.cxx |4 ++--
sc/source/filter/excel/xetable.cxx |2 +-
9 files changed, 24 insertions(+), 10 deletions(-)
New commits:
commit 6c6a4ed070acc0b106e951864fa5d20927f5c1e0
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Mar 27 05:14:06 2012 +0200
export all style information to xls/xlsx, fdo#46738
Fixes that if more than 84 empty but formatted rows at the end of a file
have been found the export skipped those rows.
Signed-off-by: Noel Power noel.po...@novell.com
diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx
index b58472e..27a086e 100644
--- a/sc/inc/attarray.hxx
+++ b/sc/inc/attarray.hxx
@@ -175,7 +175,7 @@ public:
boolIsEmpty() const;
boolGetFirstVisibleAttr( SCROW rFirstRow ) const;
-boolGetLastVisibleAttr( SCROW rLastRow, SCROW nLastData ) const;
+boolGetLastVisibleAttr( SCROW rLastRow, SCROW nLastData, bool
bFullFormattedArea = false ) const;
boolHasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const;
boolIsVisibleEqual( const ScAttrArray rOther,
SCROW nStartRow, SCROW nEndRow ) const;
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index f86bf9b..313dcd6 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -183,7 +183,7 @@ public:
boolHasSelectionMatrixFragment(const ScMarkData rMark) const;
boolGetFirstVisibleAttr( SCROW rFirstRow ) const;
-boolGetLastVisibleAttr( SCROW rLastRow ) const;
+boolGetLastVisibleAttr( SCROW rLastRow, bool bFullFormattedArea =
false ) const;
boolHasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const;
boolIsVisibleAttrEqual( const ScColumn rCol, SCROW nStartRow = 0,
SCROW nEndRow = MAXROW ) const;
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 50bcd27..6167634 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -940,6 +940,7 @@ public:
SCCOL rEndCol, SCROW rEndRow, bool
bIncludeOld, bool bOnlyDown ) const;
SC_DLLPUBLIC bool GetCellArea( SCTAB nTab, SCCOL rEndCol,
SCROW rEndRow ) const;
SC_DLLPUBLIC bool GetTableArea( SCTAB nTab, SCCOL rEndCol,
SCROW rEndRow ) const;
+SC_DLLPUBLIC void GetFormattedAndUsedArea( SCTAB nTab, SCCOL
rEndCol, SCROW rEndRow ) const;
SC_DLLPUBLIC bool GetPrintArea( SCTAB nTab, SCCOL rEndCol,
SCROW rEndRow,
bool bNotes = true ) const;
SC_DLLPUBLIC bool GetPrintAreaHor( SCTAB nTab, SCROW nStartRow,
SCROW nEndRow,
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 4f1fe38..10775e2 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -405,7 +405,7 @@ public:
boolGetCellArea( SCCOL rEndCol, SCROW rEndRow ) const;
// FALSE = empty
boolGetTableArea( SCCOL rEndCol, SCROW rEndRow ) const;
-boolGetPrintArea( SCCOL rEndCol, SCROW rEndRow, bool bNotes )
const;
+boolGetPrintArea( SCCOL rEndCol, SCROW rEndRow, bool bNotes,
bool bFullFormattedArea = false ) const;
boolGetPrintAreaHor( SCROW nStartRow, SCROW nEndRow,
SCCOL rEndCol, bool bNotes ) const;
boolGetPrintAreaVer( SCCOL nStartCol, SCCOL nEndCol,
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index 2aa660a..5714e7c 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -1831,7 +1831,7 @@ bool ScAttrArray::GetFirstVisibleAttr( SCROW rFirstRow )
const
const SCROW SC_VISATTR_STOP = 84;
-bool ScAttrArray::GetLastVisibleAttr( SCROW rLastRow, SCROW nLastData ) const
+bool ScAttrArray::GetLastVisibleAttr( SCROW rLastRow, SCROW nLastData, bool
bFullFormattedArea ) const
{
// #i30830# changed behavior:
// ignore all attributes starting with the first run of SC_VISATTR_STOP
equal rows
@@ -1862,7 +1862,7 @@ bool ScAttrArray::GetLastVisibleAttr( SCROW rLastRow,
SCROW nLastData ) const
if ( nAttrStartRow = nLastData )
nAttrStartRow = nLastData + 1;
SCROW nAttrSize = pData[nEndPos].nRow + 1 - nAttrStartRow;
-if ( nAttrSize = SC_VISATTR_STOP )
+if ( nAttrSize = SC_VISATTR_STOP !bFullFormattedArea )
{
bFound = false;// ignore this range and below
}
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 22d3da4..95b6cf8 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1443,14
[Libreoffice-commits] .: vcl/source
vcl/source/window/toolbox.cxx | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
New commits:
commit 5ae64e4b0c23f209410fe84df041c9445234df74
Author: Noel Power noel.po...@novell.com
Date: Tue Mar 27 12:32:05 2012 +0100
fix vertical align when switching mode in multibar fdo#44140
switching between SumAssign OkCancel mode in the multibar results in a
slight 'jumping' of the toolbar items when end up out of allignment with the
other toolbar items.
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 4dc2458..7b317a1 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -2722,7 +2722,19 @@ void ToolBox::ImplFormat( sal_Bool bResize )
// if special TBX_LAYOUT_LOCKVERT lock vertical
position
// don't recalulate the vertical position of the item
if ( meLayoutMode == TBX_LAYOUT_LOCKVERT mnLines ==
1 )
-it-maCalcRect.Top() = it-maRect.Top();
+{
+// Somewhat of a hack here, calc deletes and
re-adds
+// the sum/assign ok/cancel items dynamically.
+// Because TBX_LAYOUT_LOCKVERT effectively prevents
+// recalculation of the vertical pos of an item the
+// it-maRect.Top() for those newly added items is
+// 0. The hack here is that we want to effectively
+// recalculate the vertical pos for those added
+// items here. ( Note: assume mnMaxItemHeight is
+// equal to the LineSize when multibar has a single
+// line size )
+it-maCalcRect.Top() = it-maRect.Top() ?
it-maRect.Top() : ( nY + ( mnMaxItemHeight-aCurrentItemSize.Height())/2 );
+}
else
it-maCalcRect.Top() =
nY+(nLineSize-aCurrentItemSize.Height())/2;
it-maCalcRect.Right()=
nX+aCurrentItemSize.Width()-1;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/filter/xml/XMLStylesExportHelper.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 1192b227544c87f25a367ebff478cbdc190dad02
Author: Caolán McNamara caol...@redhat.com
Date: Tue Mar 27 13:03:21 2012 +0100
Resolves: rhbz#802173 crash in ScRowStyles::GetStyleNameIndex
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx
b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index a04c75b..48d9502 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -1290,6 +1290,9 @@ void ScRowStyles::AddNewTable(const sal_Int32 nTable,
const sal_Int32 nFields)
sal_Int32 ScRowStyles::GetStyleNameIndex(const sal_Int32 nTable, const
sal_Int32 nField)
{
OSL_ENSURE(static_castsize_t(nTable) aTables.size(), wrong table);
+if (!(static_castsize_t(nTable) aTables.size()))
+return -1;
+
if (maCache.hasCache(nTable, nField))
// Cache hit !
return maCache.mnStyle;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/cmclayout' - vcl/inc vcl/qa vcl/source
vcl/inc/vcl/builder.hxx|8 +
vcl/qa/cppunit/builder/demo.ui | 84 ++
vcl/source/window/builder.cxx | 232 +
3 files changed, 253 insertions(+), 71 deletions(-)
New commits:
commit b40e05451d2c03cb857e56396ad101e7b1f57bbf
Author: Caolán McNamara caol...@redhat.com
Date: Tue Mar 27 14:20:17 2012 +0100
labels, radio buttons, vbox, hbox, button-boxes, text alignment
diff --git a/vcl/inc/vcl/builder.hxx b/vcl/inc/vcl/builder.hxx
index 4c2ce32..9e7197a 100644
--- a/vcl/inc/vcl/builder.hxx
+++ b/vcl/inc/vcl/builder.hxx
@@ -31,21 +31,25 @@
#include vcl/dllapi.h
#include vcl/window.hxx
#include xmlreader/xmlreader.hxx
+#include map
#include vector
class VCL_DLLPUBLIC VclBuilder
{
private:
std::vectorWindow* m_aChildren;
+typedef std::maprtl::OString, rtl::OString stringmap;
public:
VclBuilder(Window *pParent, rtl::OUString sUIFile);
~VclBuilder();
Window *get_widget_root();
private:
-Window *makeObject(Window *pParent, xmlreader::Span name);
+Window *insertObject(Window *pParent, const rtl::OString rClass,
stringmap rVec);
+Window *makeObject(Window *pParent, const rtl::OString rClass, bool
bVertical=false);
+void handleChild(Window *pParent, xmlreader::XmlReader reader);
void handleObject(Window *pParent, xmlreader::XmlReader reader);
-void handleProperty(Window *pWindow, xmlreader::XmlReader reader);
+void collectProperty(xmlreader::XmlReader reader, stringmap rVec);
};
#endif
diff --git a/vcl/qa/cppunit/builder/demo.ui b/vcl/qa/cppunit/builder/demo.ui
index d6bd41b..92904e7 100644
--- a/vcl/qa/cppunit/builder/demo.ui
+++ b/vcl/qa/cppunit/builder/demo.ui
@@ -10,6 +10,48 @@
property name=can_focusFalse/property
property name=orientationvertical/property
property name=spacing2/property
+child
+ object class=GtkBox id=box2
+property name=visibleTrue/property
+property name=can_focusFalse/property
+child
+ object class=GtkButton id=button3
+property name=label translatable=yesbutton/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_action_appearanceFalse/property
+ /object
+ packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position0/property
+ /packing
+/child
+child
+ object class=GtkRadioButton id=radiobutton1
+property name=label
translatable=yesradiobutton/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultFalse/property
+property name=use_action_appearanceFalse/property
+property name=xalign0/property
+property name=activeTrue/property
+property name=draw_indicatorTrue/property
+ /object
+ packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position1/property
+ /packing
+/child
+ /object
+ packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position0/property
+ /packing
+/child
child internal-child=action_area
object class=GtkButtonBox id=dialog-action_area1
property name=can_focusFalse/property
@@ -51,10 +93,48 @@
/packing
/child
child
- object class=GtkLabel id=label1
+ object class=GtkBox id=box1
property name=visibleTrue/property
property name=can_focusFalse/property
-property name=label translatable=yesHello World/property
+property name=orientationvertical/property
+child
+ object class=GtkLabel id=label1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=xalign0/property
+property name=label translatable=yesleft/property
+ /object
+ packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position0/property
+ /packing
+/child
+child
+ object class=GtkLabel id=label2
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=xalign1/property
+property name=label translatable=yesright/property
[Libreoffice-commits] .: Branch 'feature/cmclayout' - vcl/qa vcl/source
vcl/qa/cppunit/builder/demo.ui | 29 +
vcl/source/window/builder.cxx | 11 +++
2 files changed, 40 insertions(+)
New commits:
commit f9cff8a149bada7f0a92f717991a573313e89699
Author: Caolán McNamara caol...@redhat.com
Date: Tue Mar 27 14:32:24 2012 +0100
checkboxes, edit controls
diff --git a/vcl/qa/cppunit/builder/demo.ui b/vcl/qa/cppunit/builder/demo.ui
index 92904e7..e77dde1 100644
--- a/vcl/qa/cppunit/builder/demo.ui
+++ b/vcl/qa/cppunit/builder/demo.ui
@@ -45,6 +45,22 @@
property name=position1/property
/packing
/child
+child
+ object class=GtkCheckButton id=checkbutton1
+property name=label
translatable=yescheckbutton/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultFalse/property
+property name=use_action_appearanceFalse/property
+property name=xalign0/property
+property name=draw_indicatorTrue/property
+ /object
+ packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position2/property
+ /packing
+/child
/object
packing
property name=expandFalse/property
@@ -135,6 +151,19 @@
property name=position2/property
/packing
/child
+child
+ object class=GtkEntry id=entry1
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=invisible_charâ/property
+property name=text translatable=yesan edit
control/property
+ /object
+ packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position3/property
+ /packing
+/child
/object
packing
property name=expandFalse/property
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 5bb7b28..882ac2f 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -29,6 +29,7 @@
#include vcl/builder.hxx
#include vcl/button.hxx
#include vcl/dialog.hxx
+#include vcl/edit.hxx
#include vcl/fixed.hxx
#include vcl/layout.hxx
@@ -88,10 +89,18 @@ Window *VclBuilder::makeObject(Window *pParent, const
rtl::OString name, bool b
{
pWindow = new RadioButton(pParent, WB_CENTER|WB_VCENTER);
}
+else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM(GtkCheckButton)))
+{
+pWindow = new CheckBox(pParent, WB_CENTER|WB_VCENTER);
+}
else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM(GtkLabel)))
{
pWindow = new FixedText(pParent, WB_CENTER|WB_VCENTER);
}
+else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM(GtkEntry)))
+{
+pWindow = new Edit(pParent, WB_CENTER|WB_VCENTER);
+}
else
{
fprintf(stderr, TO-DO, implement %s\n, name.getStr());
@@ -153,6 +162,8 @@ Window *VclBuilder::insertObject(Window *pParent, const
rtl::OString rClass, st
pCurrentChild-SetStyle(nBits);
}
+else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM(text)))
+pCurrentChild-SetText(rtl::OStringToOUString(rValue,
RTL_TEXTENCODING_UTF8));
else if
(
rKey.equalsL(RTL_CONSTASCII_STRINGPARAM(expand)) ||
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - scp2/source setup_native/source shell/inc shell/source
scp2/source/winexplorerext/file_winexplorerext.scp |
3 +
setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx |
4 -
setup_native/source/win32/customactions/reg4msdoc/registrar.cxx |
4 -
setup_native/source/win32/customactions/shellextensions/shellextensions.cxx |
16 +++---
shell/inc/internal/config.hxx |
8 +--
shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx |
26 +-
shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx |
12 ++--
shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx |
10 +--
8 files changed, 43 insertions(+), 40 deletions(-)
New commits:
commit 99d1eff4a843811bf5cb192aa3a2dc29f85d935a
Author: Andras Timar ati...@suse.com
Date: Tue Mar 27 15:36:11 2012 +0200
replace OpenOffice.org to LibreOffice in registry keys
diff --git
a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
index 7b9cfc9..4fd1700 100644
--- a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
+++ b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
@@ -117,7 +117,7 @@ static BOOL CheckExtensionInRegistry( LPCSTR lpSubKey )
{ // We will replace registration for word pad
bRet = true;
}
-else if ( strncmp( szBuffer, OpenOffice.org., 15 ) == 0 )
+else if ( strncmp( szBuffer, LibreOffice., 15 ) == 0 )
{ // We will replace registration for our own types, too
bRet = true;
}
@@ -330,7 +330,7 @@ static void saveOldRegistration( LPCSTR lpSubKey )
szBuffer[nSize] = '\0';
// No need to save assocations for our own types
-if ( strncmp( szBuffer, OpenOffice.org., 15 ) != 0 )
+if ( strncmp( szBuffer, LibreOffice., 15 ) != 0 )
{
// Save the old association
RegSetValueExA( hKey, OOoBackupAssociation, 0,
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
b/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
index 5220b1e..967f9c8 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
@@ -55,10 +55,10 @@ namespace /* private */
Registrar::Registrar(const RegistrationContextInformation RegContext) :
m_ContextInformation(RegContext),
-FORWARD_KEY_PREFIX(LOpenOffice.org),//FORWARD_KEY_PREFIX(Lsoffice6),
+FORWARD_KEY_PREFIX(LLibreOffice),
DEFAULT_VALUE_NAME(L),
BACKUP_VALUE_NAME(LBackup),
-
PRIVATE_BACKUP_KEY_NAME(LOpenOffice.org.reg4msdocmsi),//PRIVATE_BACKUP_KEY_NAME(Lsoffice6.bak),
+PRIVATE_BACKUP_KEY_NAME(LLibreOffice.reg4msdocmsi),
REGISTRATION_STATE(LReg4MsDocState)
{
m_RootKey = WindowsRegistry().GetClassesRootKey();
diff --git
a/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx
b/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx
index 01f0b30..790a342 100644
---
a/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx
+++
b/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx
@@ -59,10 +59,10 @@
/MSDN
We add the following entries to the respective registry key
-{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}=OpenOffice.org Column Handler
-{087B3AE3-E237-4467-B8DB-5A38AB959AC9}=OpenOffice.org Infotip Handler
-{63542C48-9552-494A-84F7-73AA6A7C99C1}=OpenOffice.org Property Sheet
Handler
-{3B092F0C-7696-40E3-A80F-68D74DA84210}=OpenOffice.org Thumbnail Viewer
+{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}=LibreOffice Column Handler
+{087B3AE3-E237-4467-B8DB-5A38AB959AC9}=LibreOffice Infotip Handler
+{63542C48-9552-494A-84F7-73AA6A7C99C1}=LibreOffice Property Sheet
Handler
+{3B092F0C-7696-40E3-A80F-68D74DA84210}=LibreOffice Thumbnail Viewer
These shell extensions are implemented in the 'shell' project. We ignore
registration
failures because of insufficient privileges. The reason is: On systems
which restrict the
@@ -95,10 +95,10 @@ struct RegistryEntry
TCHAR* Value;
};
-RegistryEntry ColumnHandler = {
TEXT({C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}), TEXT(OpenOffice.org Column
Handler) };
-RegistryEntry InfotipHandler = {
TEXT({087B3AE3-E237-4467-B8DB-5A38AB959AC9}), TEXT(OpenOffice.org Infotip
Handler) };
-RegistryEntry PropHandler = { TEXT({63542C48-9552-494A-84F7-73AA6A7C99C1}),
TEXT(OpenOffice.org Property Sheet Handler) };
-RegistryEntry ThumbViewer = { TEXT({3B092F0C-7696-40E3-A80F-68D74DA84210}),
TEXT(OpenOffice.org Thumbnail Viewer) };
+RegistryEntry ColumnHandler = {
TEXT({C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}), TEXT(LibreOffice Column
Handler) };
[Libreoffice-commits] .: shell/inc shell/source
shell/inc/internal/config.hxx|2 +- shell/source/win32/shlxthandler/shlxthdl.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit a7dc11cfbf351e05e23b66b66574c30c7fbbfc64 Author: Andras Timar ati...@suse.com Date: Tue Mar 27 15:47:07 2012 +0200 typo fix diff --git a/shell/inc/internal/config.hxx b/shell/inc/internal/config.hxx index 0d3cbf5..85069bc 100644 --- a/shell/inc/internal/config.hxx +++ b/shell/inc/internal/config.hxx @@ -46,7 +46,7 @@ #define COLUMN_HANDLER_DESCRIPTIVE_NAMETEXT(LibreOffice Column Handler) #define INFOTIP_HANDLER_DESCRIPTIVE_NAME TEXT(LibreOffice Infotip Handler) #define PROPSHEET_HANDLER_DESCRIPTIVE_NAME TEXT(LibreOffice Property Sheet Handler) -#define THUMBVIEWER_HANDLER_DESCRIPTIVAE_NAME TEXT(LibreOffice Thumbnail Viewer) +#define THUMBVIEWER_HANDLER_DESCRIPTIVE_NAME TEXT(LibreOffice Thumbnail Viewer) #define META_CONTENT_NAME meta.xml #define DOC_CONTENT_NAMEcontent.xml diff --git a/shell/source/win32/shlxthandler/shlxthdl.cxx b/shell/source/win32/shlxthandler/shlxthdl.cxx index 0d4308c..21257c7 100644 --- a/shell/source/win32/shlxthandler/shlxthdl.cxx +++ b/shell/source/win32/shlxthandler/shlxthdl.cxx @@ -339,7 +339,7 @@ extern C STDAPI DllRegisterServer() hr = E_FAIL; if (SUCCEEDED(RegisterThumbviewerHandler(module_path.c_str( -ApproveShellExtension(CLSID_THUMBVIEWER_HANDLER, THUMBVIEWER_HANDLER_DESCRIPTIVAE_NAME); +ApproveShellExtension(CLSID_THUMBVIEWER_HANDLER, THUMBVIEWER_HANDLER_DESCRIPTIVE_NAME); else hr = E_FAIL; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: setup_native/source
setup_native/source/win32/customactions/shellextensions/shellextensions.cxx |
2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 935150a59b160cc45652b88fd41824b53af3676d
Author: Andras Timar ati...@suse.com
Date: Tue Mar 27 15:49:22 2012 +0200
typo fix in comment
diff --git
a/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx
b/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx
index 790a342..5ddea95 100644
---
a/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx
+++
b/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx
@@ -165,7 +165,7 @@ extern C UINT __stdcall
InstallExecSequenceEntry(MSIHANDLE hMSI)
RegCloseKey(hKey);
}
-// Open Windows 32 Bit Registry on Win64 maschine
+// Open Windows 32 Bit Registry on Win64 machine
if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,
TEXT(Software\\Microsoft\\Windows\\CurrentVersion\\Shell
Extensions\\Approved),0, KEY_WRITE, hKey ) == ERROR_SUCCESS)
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: setup_native/source
setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 45a222a72b49bacddb962bfb34346558e45eff6b
Author: Andras Timar ati...@suse.com
Date: Tue Mar 27 15:56:50 2012 +0200
fix number of chars in strncmp after OpenOffice.org-LibreOffice change
diff --git
a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
index 4fd1700..c7e4c3b 100644
--- a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
+++ b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
@@ -117,7 +117,7 @@ static BOOL CheckExtensionInRegistry( LPCSTR lpSubKey )
{ // We will replace registration for word pad
bRet = true;
}
-else if ( strncmp( szBuffer, LibreOffice., 15 ) == 0 )
+else if ( strncmp( szBuffer, LibreOffice., 12 ) == 0 )
{ // We will replace registration for our own types, too
bRet = true;
}
@@ -330,7 +330,7 @@ static void saveOldRegistration( LPCSTR lpSubKey )
szBuffer[nSize] = '\0';
// No need to save assocations for our own types
-if ( strncmp( szBuffer, LibreOffice., 15 ) != 0 )
+if ( strncmp( szBuffer, LibreOffice., 12 ) != 0 )
{
// Save the old association
RegSetValueExA( hKey, OOoBackupAssociation, 0,
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/source
desktop/source/app/cmdlineargs.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 867588b4caf35d4954c7b26b7ac070a7a4675cd3
Author: Caolán McNamara caol...@redhat.com
Date: Tue Mar 27 15:21:57 2012 +0100
Resolves: rhbz#807316 don't complain that nocrashreport is an unknown option
diff --git a/desktop/source/app/cmdlineargs.cxx
b/desktop/source/app/cmdlineargs.cxx
index 0bc6312..037c716 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -311,7 +311,9 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier
supplier )
// primitive tools that /bin/sh offers, ignore them here
if
(!oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(backtrace))
!oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(strace))
-
!oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(valgrind)))
+
!oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(valgrind))
+//ignore additional legacy options that don't do anything
anymore
+
!oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(nocrashreport)))
{
fprintf(stderr, Unknown option %s\n,
rtl::OUStringToOString(aArg,
osl_getThreadTextEncoding()).getStr());
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-2' - sw/source
sw/source/core/edit/edundo.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 66603450eb12eed9f3d1e9b4210210c9630f64e1
Author: Michael Stahl mst...@redhat.com
Date: Thu Mar 22 23:03:05 2012 +0100
fdo#39003: fix autoformat Undo cursors:
SwEditShell::Undo: Because the Undo actions nowadays create new shell
cursors directly (while previously they worked on a SwUndoIter), it is
necessary to remove the shell cursor ring before Pop() because Pop(false)
only restores the current cursor from the stack, not the rest of the ring.
(regression from CWS undoapi, 1ba0c1878116ada5dc4ebdecdb1e0a3da9758547)
(cherry picked from commit f24153cded54954da7f0d80941707715c78e4627)
Signed-off-by: Caolán McNamara caol...@redhat.com
Signed-off-by: Cedric Bosdonnat cbosdon...@suse.com
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/sw/source/core/edit/edundo.cxx b/sw/source/core/edit/edundo.cxx
index 7b2ae83..118b3f9 100644
--- a/sw/source/core/edit/edundo.cxx
+++ b/sw/source/core/edit/edundo.cxx
@@ -142,6 +142,10 @@ bool SwEditShell::Undo(sal_uInt16 const nCount)
.getStr());
}
+if (bRestoreCrsr)
+{ // fdo#39003 Pop does not touch the rest of the cursor ring
+KillPams(); // so call this first to get rid of unwanted cursors
+}
Pop( !bRestoreCrsr );
GetDoc()-SetRedlineMode( eOld );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/cmclayout' - vcl/source
vcl/source/window/builder.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2534bf5538d7a8db7184fcade7112d1564cd3628
Author: Caolán McNamara caol...@redhat.com
Date: Tue Mar 27 14:44:52 2012 +0100
GtkEntry defaults to Left alignment
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 882ac2f..b8d1ec9 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -99,7 +99,7 @@ Window *VclBuilder::makeObject(Window *pParent, const
rtl::OString name, bool b
}
else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM(GtkEntry)))
{
-pWindow = new Edit(pParent, WB_CENTER|WB_VCENTER);
+pWindow = new Edit(pParent, WB_LEFT|WB_VCENTER );
}
else
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/cmclayout' - vcl/inc vcl/qa vcl/source
vcl/inc/vcl/builder.hxx|4 +
vcl/qa/cppunit/builder/demo.ui | 39 +++
vcl/source/window/builder.cxx | 104 -
3 files changed, 125 insertions(+), 22 deletions(-)
New commits:
commit b3a68ecde53c7354cac960ebabaefb8dcb85baab
Author: Caolán McNamara caol...@redhat.com
Date: Tue Mar 27 16:32:28 2012 +0100
import expand/fill etc.
diff --git a/vcl/inc/vcl/builder.hxx b/vcl/inc/vcl/builder.hxx
index 9e7197a..588505a 100644
--- a/vcl/inc/vcl/builder.hxx
+++ b/vcl/inc/vcl/builder.hxx
@@ -48,7 +48,9 @@ private:
Window *makeObject(Window *pParent, const rtl::OString rClass, bool
bVertical=false);
void handleChild(Window *pParent, xmlreader::XmlReader reader);
-void handleObject(Window *pParent, xmlreader::XmlReader reader);
+Window* handleObject(Window *pParent, xmlreader::XmlReader reader);
+void handlePacking(Window *pCurrent, xmlreader::XmlReader reader);
+void applyPackingProperty(Window *pCurrent, xmlreader::XmlReader reader);
void collectProperty(xmlreader::XmlReader reader, stringmap rVec);
};
diff --git a/vcl/qa/cppunit/builder/demo.ui b/vcl/qa/cppunit/builder/demo.ui
index e77dde1..786ad76 100644
--- a/vcl/qa/cppunit/builder/demo.ui
+++ b/vcl/qa/cppunit/builder/demo.ui
@@ -11,6 +11,45 @@
property name=orientationvertical/property
property name=spacing2/property
child
+ object class=GtkBox id=box3
+property name=visibleTrue/property
+property name=can_focusFalse/property
+child
+ object class=GtkButton id=button4
+property name=label translatable=yesEXPAND/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_action_appearanceFalse/property
+ /object
+ packing
+property name=expandTrue/property
+property name=fillTrue/property
+property name=position0/property
+ /packing
+/child
+child
+ object class=GtkButton id=button5
+property name=label translatable=yesFILL/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_action_appearanceFalse/property
+ /object
+ packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position1/property
+ /packing
+/child
+ /object
+ packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position0/property
+ /packing
+/child
+child
object class=GtkBox id=box2
property name=visibleTrue/property
property name=can_focusFalse/property
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index b8d1ec9..cbfc274 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -28,10 +28,12 @@
#include vcl/builder.hxx
#include vcl/button.hxx
+#include vcl/combobox.hxx
#include vcl/dialog.hxx
#include vcl/edit.hxx
#include vcl/fixed.hxx
#include vcl/layout.hxx
+#include vcl/spin.hxx
VclBuilder::VclBuilder(Window *pParent, rtl::OUString sUri)
{
@@ -93,6 +95,14 @@ Window *VclBuilder::makeObject(Window *pParent, const
rtl::OString name, bool b
{
pWindow = new CheckBox(pParent, WB_CENTER|WB_VCENTER);
}
+else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM(GtkSpinButton)))
+{
+pWindow = new SpinButton(pParent, WB_CENTER|WB_VCENTER);
+}
+else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM(GtkComboBox)))
+{
+pWindow = new ComboBox(pParent, WB_CENTER|WB_VCENTER);
+}
else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM(GtkLabel)))
{
pWindow = new FixedText(pParent, WB_CENTER|WB_VCENTER);
@@ -164,15 +174,6 @@ Window *VclBuilder::insertObject(Window *pParent, const
rtl::OString rClass, st
}
else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM(text)))
pCurrentChild-SetText(rtl::OStringToOUString(rValue,
RTL_TEXTENCODING_UTF8));
-else if
-(
-rKey.equalsL(RTL_CONSTASCII_STRINGPARAM(expand)) ||
-rKey.equalsL(RTL_CONSTASCII_STRINGPARAM(fill))
-)
-{
-bool bTrue = (rValue[0] == 't' || rValue[0] == 'T' ||
rValue[0] == '1');
-pCurrentChild-setChildProperty(rKey, bTrue);
-}
else
fprintf(stderr, unhandled property %s\n, rKey.getStr());
}
[Libreoffice-commits] .: 2 commits - oox/inc oox/source sc/source unusedcode.easy
oox/inc/oox/dump/dumperbase.hxx |4 --
oox/inc/oox/mathml/importutils.hxx|4 --
oox/inc/oox/ppt/pptshape.hxx |1
oox/source/dump/dumperbase.cxx|5 ---
oox/source/mathml/importutils.cxx | 10 ---
oox/source/ppt/pptshape.cxx |7 -
sc/source/filter/inc/addressconverter.hxx |1
sc/source/filter/inc/biffoutputstream.hxx | 11
sc/source/filter/inc/sheetdatabuffer.hxx |8 -
sc/source/filter/oox/addressconverter.cxx |6
sc/source/filter/oox/biffoutputstream.cxx | 13 -
sc/source/filter/oox/sheetdatabuffer.cxx | 41 --
unusedcode.easy | 12
13 files changed, 1 insertion(+), 122 deletions(-)
New commits:
commit 8ff435eab96f6bc8a2da203c10a6d6a7b72db296
Author: Caolán McNamara caol...@redhat.com
Date: Tue Mar 27 16:51:42 2012 +0100
fix build, restore these constructors for now
These classes appear to never be constructed and can go in
their entirity, but its a bit of a rats nest at the moment
diff --git a/sc/source/filter/inc/biffoutputstream.hxx
b/sc/source/filter/inc/biffoutputstream.hxx
index 7ea14a1..45ae4d8 100644
--- a/sc/source/filter/inc/biffoutputstream.hxx
+++ b/sc/source/filter/inc/biffoutputstream.hxx
@@ -46,6 +46,9 @@ namespace prv {
class BiffOutputRecordBuffer
{
public:
+explicitBiffOutputRecordBuffer(
+BinaryOutputStream rOutStrm,
+sal_uInt16 nMaxRecSize );
/** Returns the wrapped binary base stream. */
inline const BinaryOutputStream getBaseStream() const { return mrOutStrm;
}
diff --git a/sc/source/filter/inc/sheetdatabuffer.hxx
b/sc/source/filter/inc/sheetdatabuffer.hxx
index 05ccc19..3e83420 100644
--- a/sc/source/filter/inc/sheetdatabuffer.hxx
+++ b/sc/source/filter/inc/sheetdatabuffer.hxx
@@ -95,6 +95,8 @@ struct DataTableModel
class CellBlock : public WorksheetHelper
{
public:
+explicitCellBlock( const WorksheetHelper rHelper, const
ValueRange rColSpan, sal_Int32 nRow );
+
/** Returns true, if the own colspan contains the passed column. */
boolcontains( sal_Int32 nCol ) const;
diff --git a/sc/source/filter/oox/biffoutputstream.cxx
b/sc/source/filter/oox/biffoutputstream.cxx
index 7fd233d..f4d24fe 100644
--- a/sc/source/filter/oox/biffoutputstream.cxx
+++ b/sc/source/filter/oox/biffoutputstream.cxx
@@ -35,6 +35,16 @@ namespace xls {
namespace prv {
+BiffOutputRecordBuffer::BiffOutputRecordBuffer( BinaryOutputStream rOutStrm,
sal_uInt16 nMaxRecSize ) :
+mrOutStrm( rOutStrm ),
+mnMaxRecSize( nMaxRecSize ),
+mnRecId( BIFF_ID_UNKNOWN ),
+mbInRec( false )
+{
+OSL_ENSURE( mrOutStrm.isSeekable(),
BiffOutputRecordBuffer::BiffOutputRecordBuffer - stream must be seekable );
+maData.reserve( SAL_MAX_UINT16 );
+}
+
void BiffOutputRecordBuffer::startRecord( sal_uInt16 nRecId )
{
OSL_ENSURE( !mbInRec, BiffOutputRecordBuffer::startRecord - another
record still open );
diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx
b/sc/source/filter/oox/sheetdatabuffer.cxx
index b0f778d..561083a 100644
--- a/sc/source/filter/oox/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -117,6 +117,17 @@ const sal_Int32 CELLBLOCK_MAXROWS = 16;/// Number of
rows in a cell block.
} // namespace
+CellBlock::CellBlock( const WorksheetHelper rHelper, const ValueRange
rColSpan, sal_Int32 nRow ) :
+WorksheetHelper( rHelper ),
+maRange( rHelper.getSheetIndex(), rColSpan.mnFirst, nRow, rColSpan.mnLast,
nRow ),
+mnRowLength( rColSpan.mnLast - rColSpan.mnFirst + 1 ),
+mnFirstFreeIndex( 0 )
+{
+maCellArray.realloc( 1 );
+maCellArray[ 0 ].realloc( mnRowLength );
+mpCurrCellRow = maCellArray[ 0 ].getArray();
+}
+
bool CellBlock::contains( sal_Int32 nCol ) const
{
return (maRange.StartColumn = nCol) (nCol = maRange.EndColumn);
commit 16410cdcb91b3d358ab2964deefe8d357cae613b
Author: Petr Vorel petr.vo...@gmail.com
Date: Tue Mar 27 11:03:09 2012 +0200
remove unused code (oox, sc)
diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx
index 534776b..5989c1e 100644
--- a/oox/inc/oox/dump/dumperbase.hxx
+++ b/oox/inc/oox/dump/dumperbase.hxx
@@ -1860,10 +1860,6 @@ public:
const BinaryInputStreamRef rxStrm,
const ::rtl::OUString rSysFileName );
-explicitXmlStreamObject(
-const OutputObjectBase rParent,
-const BinaryInputStreamRef rxStrm );
-
protected:
virtual voidimplDumpText( TextInputStream rTextStrm );
};
diff --git a/oox/inc/oox/mathml/importutils.hxx
b/oox/inc/oox/mathml/importutils.hxx
index 9b90681..fc0e276 100644
--- a/oox/inc/oox/mathml/importutils.hxx
+++ b/oox/inc/oox/mathml/importutils.hxx
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.2.2'
Tag 'libreoffice-3.5.2.2' created by Petr Mladek pmla...@suse.cz at 2012-03-27 17:22 -0700 Tag 3.5.2.2 (3.5.2-rc2) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPcelyAAoJEPQ0oe+v7q6jnWsP/3TEaK34GjNqAxqGZDIx8ft7 cR/BjgsO1lCWlgbR5Ya3mx49ja+OJO4PHQxAMEYWYdnRtXXCiEpJAi/jsPeWIHeN jbs06C9V8h4+WuwoheUCvURoHIrGTPg5p3PSuhWZQ3AqbYxoN2oK0+QktMCrVUsP A/IKJ/tjAYIxEgF/E5efR444U2nsEacqTI4n7B6MqgE90qaDUND9UyaWi4kVjdsC +mLtOZTUumiZEonSf6zVun5IHtTygzGqIy0lCmQW69tmvNyqI0yHv+vJzTdb5Dy6 YTYEVnfc9gOeJUSEawEBIx4NK/HXprHeWp4/++Xo759QxDmj2VW75uvA+DgBOhNh PFHQnKonvh+ipG+z8sgTKgbju33/2hxUDZJA/zji3B5haM+gd9J3AgwVoKSc5uVJ 0jrEmLyGNw6MkwoFhADdR/W5qd7bMl5hOtoBEe6H/Ni2k4BSbhVDpzylffQne6sG lz3b/Jb0UN8JeemWa14UL05HlS3jR6m23ESHn2djJziQdeiupL5Za0nPdk8r7q+I oiFAL5Ezz5NElBXI54GUnvGZORb0mFIJkeTmLOxIrd3FXLGWQGny53LVdISW5yiA EuS6oqfefYC6Ohuk2rSMerbpyGkpYVd2dGZpdU1MchiyY/YmydNPvFEulR5bgV9S hgJB8BvbXKXPdDat0Vvd =A5bL -END PGP SIGNATURE- Changes since libreoffice-3-5-branch-point-976: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.2.2'
Tag 'libreoffice-3.5.2.2' created by Petr Mladek pmla...@suse.cz at 2012-03-27 17:23 -0700 Tag 3.5.2.2 (3.5.2-rc2) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPcelyAAoJEPQ0oe+v7q6jlvwP/jEUAJ1QwQ3QKdVSAYoIU42u 1Fu2R7EfqslE9bZlGFdobMieu9Jia1GEJqWD2g4BsYEuJNKeitjFZ1IbF1SPCD/w mOY0Rh0XGrYB7F5ZLyWhfvFDdkcDPj4E3XujnYISBSIkwOsMIXsMydAVIgRGrjx0 AdepcY9Kytj7sPorrfw9R4HtQXNwW0PzBHTtYJfBKNfpaanVTtwA/Xy/FfURkBpD dAzqbtFbYK7AMeX/IONjYmJGePMIqC1wnFO6D8c9BfSE9u5xBwgsUjqFlJfxxwMw GspFAocTR3gLqK/sfRxXB4c2qx6fvmEPN8c5clU3Ea1GNgghsgzy8wh3MAY7ERIK I67/T3tTLFBPd3LjHz4Wx6CRrkf+8DIpVL6bMB5TaITEYn4G3UEVXqF366ng7917 /nbrojDRP+SGjXlSr5x1OMvRLvEPt/2NRK5EPghVpT4/pZVbYBRK6W2PxZX2ruhR PprS47Mx18ObSnawLk9q247gpdfORQnX3LVlheabspliWTVROQ42xRRpPznQlmaJ GCAerZdaz2aTjuaa1q4IbBCuz6skK4ApZW0oiw9q5W9mp2zsXMGdSuQkRxarVhJ1 xItUQVUAJJKrBN3W5Ge6Klg/x+p5Aco/u13cfo7+Xoo6zlSMU1qmh7gA/AUg8n0b rS4y1VYi9xos2pl/KoW2 =pJQ5 -END PGP SIGNATURE- Changes since libreoffice-3.5.0.1-4: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.2.2'
Tag 'libreoffice-3.5.2.2' created by Petr Mladek pmla...@suse.cz at 2012-03-27 17:23 -0700 Tag 3.5.2.2 (3.5.2-rc2) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPcelyAAoJEPQ0oe+v7q6jfIIP/3uiaVsXuYvKgMrqU4L9n7Xb niTT2UYZlZ6c4XTwNRZWgGIijNf8sgOpp/8Ts6+6PssoMzhcMvF5g7NKKunB9vER y4hdyN7ayKAe3Sh01mxjnMs6qYiAVuJRBwJaamliEQ7zoIeR/9Ea3mDP7FvXKBXg 8petEVnTH8y7xhVXXueiipkcs6AzZgYzqxELMtm8i3LmySLhbwDCTN/WkU1ONma2 DM5pw23cjdpEG+4x7cJ9z9636BR60IR5wsB58kh5yzmv3KX2bpQNdiriikUwErrX yZ7DWCC+6OuzQsmrDxClixe0MwwRqO98Cg+EvJ5GAxQb8ozIWmNV6ngvpPQ4HHwe ew9fh5Pw1aUR6o4vGGCYRId0uKSQh+zzKabhosjp0pg+KbJsC8nfzBjVcGBnizFe 0fEWQJdKY2el3YKc2dI1o3L9mI3P4YMmFvRG3v0MYVNi/mrqxroHt/88cVulACMv Nh6S3MqEYxmcm/0lH8K0UWezdsjeOEQDTFjxGf7GI2PJPz0Lp381SPSmmq8UwLip 1fu94YGVqHA1w2Aqu69Avb/RJEZtlzwQbbKEnod1P0tBNXtfDqUY1TQc7JEKwsJU K35GpL2N5vNRElOKMtGKRmz8XTT9saudrrogaBQp40jv49/Qf8tOzYkUQpHuwPP3 xcY/6XKpuNcgBl495KFC =kxDH -END PGP SIGNATURE- Changes since libreoffice-3-5-branch-point-31: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: bridges/source
bridges/source/cpp_uno/mingw_intel/except.cxx |9 -
bridges/source/cpp_uno/mingw_intel/share.hxx | 19 ++-
bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx |2 +-
3 files changed, 23 insertions(+), 7 deletions(-)
New commits:
commit 54e3855bffafe24d2dbb29451885282bab57ecef
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Mar 27 18:51:25 2012 +0200
MinGW: Adapted cpp_uno bridge to GCC 4.7
...which incompatibly changed the calling convention of the third (dest)
function pointer parameter of __cxa_throw to __thiscall.
diff --git a/bridges/source/cpp_uno/mingw_intel/except.cxx
b/bridges/source/cpp_uno/mingw_intel/except.cxx
index 4b74588..308ccb8 100644
--- a/bridges/source/cpp_uno/mingw_intel/except.cxx
+++ b/bridges/source/cpp_uno/mingw_intel/except.cxx
@@ -29,7 +29,12 @@
#include stdio.h
#include string.h
+
#include cxxabi.h
+#ifndef _GLIBCXX_CDTOR_CALLABI // new in GCC 4.7 cxxabi.h
+#define _GLIBCXX_CDTOR_CALLABI
+#endif
+
#include boost/unordered_map.hpp
#include rtl/instance.hxx
@@ -193,7 +198,8 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription
*pTypeDescr ) SAL_THR
struct RTTISingleton: public rtl::Static RTTI, RTTISingleton {};
//--
-static void deleteException( void * pExc )
+extern C {
+static void _GLIBCXX_CDTOR_CALLABI deleteException( void * pExc )
{
__cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
typelib_TypeDescription * pTD = 0;
@@ -206,6 +212,7 @@ static void deleteException( void * pExc )
::typelib_typedescription_release( pTD );
}
}
+}
//==
void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
diff --git a/bridges/source/cpp_uno/mingw_intel/share.hxx
b/bridges/source/cpp_uno/mingw_intel/share.hxx
index da2367a..e6e4337 100644
--- a/bridges/source/cpp_uno/mingw_intel/share.hxx
+++ b/bridges/source/cpp_uno/mingw_intel/share.hxx
@@ -68,17 +68,26 @@ struct __cxa_exception
_Unwind_Exception unwindHeader;
};
+struct __cxa_eh_globals
+{
+__cxa_exception *caughtExceptions;
+unsigned int uncaughtExceptions;
+};
+
+}
+
+extern C CPPU_CURRENT_NAMESPACE::__cxa_eh_globals *__cxa_get_globals ()
throw();
+
+// The following are in cxxabi.h since GCC 4.7:
+#if __GNUC__ == 4 __GNUC_MINOR__ = 6
extern C void *__cxa_allocate_exception(
std::size_t thrown_size ) throw();
extern C void __cxa_throw (
void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) )
__attribute__((noreturn));
+#endif
-struct __cxa_eh_globals
+namespace CPPU_CURRENT_NAMESPACE
{
-__cxa_exception *caughtExceptions;
-unsigned int uncaughtExceptions;
-};
-extern C __cxa_eh_globals *__cxa_get_globals () throw();
// -
diff --git a/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx
b/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx
index fd36c75..d2ae057 100644
--- a/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx
@@ -345,7 +345,7 @@ static void cpp_call(
catch (...)
{
// fill uno exception
-fillUnoException(
CPPU_CURRENT_NAMESPACE::__cxa_get_globals()-caughtExceptions, *ppUnoExc,
pThis-getBridge()-getCpp2Uno() );
+fillUnoException( __cxa_get_globals()-caughtExceptions, *ppUnoExc,
pThis-getBridge()-getCpp2Uno() );
// temporary params
for ( ; nTempIndizes--; )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - editeng/inc editeng/source sc/source svl/inc svl/source
editeng/inc/editeng/flditem.hxx | 72 +++--
editeng/source/items/flditem.cxx| 78
sc/source/filter/excel/xehelper.cxx | 12 ++---
sc/source/filter/inc/xehelper.hxx |2
svl/inc/svl/zforlist.hxx|4 +
svl/source/numbers/zforlist.cxx | 12 +
6 files changed, 100 insertions(+), 80 deletions(-)
New commits:
commit 1e91520e7af29c390c03d05b39992da5aaf6d1c7
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Mar 27 10:57:14 2012 -0400
UniString removal.
diff --git a/editeng/inc/editeng/flditem.hxx b/editeng/inc/editeng/flditem.hxx
index b54e37c..be874b0 100644
--- a/editeng/inc/editeng/flditem.hxx
+++ b/editeng/inc/editeng/flditem.hxx
@@ -144,8 +144,8 @@ public:
// If eLanguage==LANGUAGE_DONTKNOW the
language/country
// used in number formatter initialization is
taken.
-String GetFormatted( SvNumberFormatter rFormatter,
LanguageType eLanguage ) const;
-static String GetFormatted( Date rDate, SvxDateFormat eFormat,
SvNumberFormatter rFormatter, LanguageType eLanguage );
+rtl::OUString GetFormatted( SvNumberFormatter rFormatter,
LanguageType eLanguage ) const;
+static rtl::OUStringGetFormatted( Date rDate, SvxDateFormat eFormat,
SvNumberFormatter rFormatter, LanguageType eLanguage );
virtual SvxFieldData* Clone() const;
virtual int operator==( const SvxFieldData ) const;
@@ -163,24 +163,24 @@ class EDITENG_DLLPUBLIC SvxURLField : public SvxFieldData
{
private:
SvxURLFormateFormat;
-XubString aURL; // URL-Address
-XubString aRepresentation;// What is shown
-XubString aTargetFrame; // In what Frame
+rtl::OUString aURL; // URL-Address
+rtl::OUString aRepresentation;// What is shown
+rtl::OUString aTargetFrame; // In what Frame
public:
SV_DECL_PERSIST1( SvxURLField, SvxFieldData,
SVX_URLFIELD )
SvxURLField();
-SvxURLField( const XubString rURL, const
XubString rRepres, SvxURLFormat eFmt = SVXURLFORMAT_URL );
+SvxURLField( const rtl::OUString rURL, const
rtl::OUString rRepres, SvxURLFormat eFmt = SVXURLFORMAT_URL );
-const XubStringGetURL() const { return aURL; }
-voidSetURL( const XubString rURL ) { aURL = rURL; }
+const rtl::OUStringGetURL() const { return aURL; }
+voidSetURL( const rtl::OUString rURL ) { aURL = rURL;
}
-const XubStringGetRepresentation() const { return
aRepresentation; }
-voidSetRepresentation( const XubString rRep ) {
aRepresentation= rRep; }
+const rtl::OUStringGetRepresentation() const { return
aRepresentation; }
+voidSetRepresentation( const rtl::OUString rRep ) {
aRepresentation= rRep; }
-const XubStringGetTargetFrame() const { return aTargetFrame; }
-voidSetTargetFrame( const XubString rFrm ) {
aTargetFrame = rFrm; }
+const rtl::OUStringGetTargetFrame() const { return aTargetFrame; }
+voidSetTargetFrame( const rtl::OUString rFrm ) {
aTargetFrame = rFrm; }
SvxURLFormatGetFormat() const { return eFormat; }
voidSetFormat( SvxURLFormat eFmt ) { eFormat = eFmt; }
@@ -281,8 +281,8 @@ public:
// If eLanguage==LANGUAGE_DONTKNOW the
language/country
// used in number formatter initialization is
taken.
-String GetFormatted( SvNumberFormatter rFormatter,
LanguageType eLanguage ) const;
-static String GetFormatted( Time rTime, SvxTimeFormat eFormat,
SvNumberFormatter rFormatter, LanguageType eLanguage );
+rtl::OUString GetFormatted( SvNumberFormatter rFormatter,
LanguageType eLanguage ) const;
+static rtl::OUStringGetFormatted( Time rTime, SvxTimeFormat eFormat,
SvNumberFormatter rFormatter, LanguageType eLanguage );
virtual SvxFieldData* Clone() const;
virtual int operator==( const SvxFieldData ) const;
@@ -303,19 +303,19 @@ enum SvxFileFormat {SVXFILEFORMAT_NAME_EXT, // File
name with Extension
class EDITENG_DLLPUBLIC SvxExtFileField : public SvxFieldData
{
private:
-XubString aFile;
+rtl::OUString aFile;
SvxFileType eType;
SvxFileFormat eFormat;
public:
SV_DECL_PERSIST1( SvxExtFileField, SvxFieldData,
SVX_EXT_FILEFIELD )
SvxExtFileField();
-SvxExtFileField( const XubString rString,
[Libreoffice-commits] .: Branch 'feature/gbuild_conversions' - 8 commits - connectivity/AllLangResTarget_hsqldb.mk connectivity/Library_dbase.mk connectivity/Library_dbtools.mk connectivity/Library_ev
Repository.mk |1 RepositoryExternal.mk | 28 - connectivity/AllLangResTarget_hsqldb.mk| 47 + connectivity/Library_dbase.mk |1 connectivity/Library_dbtools.mk|8 + connectivity/Library_evoab2.mk |9 + connectivity/Library_file.mk |1 connectivity/Library_flat.mk |1 connectivity/Library_hsqldb.mk | 80 +++ connectivity/Library_jdbc.mk |1 connectivity/Makefile |2 connectivity/Module_connectivity.mk|2 connectivity/source/drivers/hsqldb/makefile.mk | 126 - 13 files changed, 175 insertions(+), 132 deletions(-) New commits: commit 67b4a880e85476a5420e4278918c23da96375970 Author: David Tardon dtar...@redhat.com Date: Tue Mar 27 16:36:31 2012 +0200 connectivity: convert hsqldb diff --git a/Repository.mk b/Repository.mk index 49e04dc..4017476 100644 --- a/Repository.mk +++ b/Repository.mk @@ -163,6 +163,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ fwm \ guesslang \ helplinker \ +hsqldb \ hwp \ hyphen \ i18npaper \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 324d206..42c7ba7 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -922,6 +922,26 @@ $(call gb_LinkTarget_set_include,$(1),\ ) endef + +ifdef ($(SYSTEM_HSQLDB),YES) + +define gb_LinkTarget__use_hsqldb + +$(call gb_LinkTarget_add_defs,$(1),\ + -DSYSTEM_HSQLDB \ + -DHSQLDB_JAR=\file://$(HSQLDB_JAR)\ \ +) + +endef + +else # !SYSTEM_HSQLDB + +define gb_LinkTarget__use_hsqldb + +endef + +endif # SYSTEM_HSQLDB + # MacOSX-only frameworks # (in alphabetical order) diff --git a/connectivity/AllLangResTarget_hsqldb.mk b/connectivity/AllLangResTarget_hsqldb.mk new file mode 100644 index 000..923833d --- /dev/null +++ b/connectivity/AllLangResTarget_hsqldb.mk @@ -0,0 +1,47 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the License); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an AS IS basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon dtar...@redhat.com +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the GPLv3+), or +# the GNU Lesser General Public License Version 3 or later (the LGPLv3+), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_AllLangResTarget_AllLangResTarget,hsqldb)) + +$(eval $(call gb_AllLangResTarget_set_reslocation,hsqldb,database)) + +$(eval $(call gb_AllLangResTarget_add_srs,hsqldb,\ + database \ +)) + +$(eval $(call gb_SrsTarget_SrsTarget,hsqldb/res)) + +$(eval $(call gb_SrsTarget_set_include,hsqldb/res,\ + -I$(SRCDIR)/connectivity/source/drivers/hsqldb \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_SrsTarget_add_files,hsqldb/res,\ + connectivity/source/drivers/hsqldb/hsqlui.src \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/connectivity/Library_hsqldb.mk b/connectivity/Library_hsqldb.mk new file mode 100644 index 000..fda6612 --- /dev/null +++ b/connectivity/Library_hsqldb.mk @@ -0,0 +1,80 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the License); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an AS IS basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon dtar...@redhat.com +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the
[Libreoffice-commits] .: 4 commits - editeng/source sw/source
editeng/source/editeng/edtspell.cxx | 96 +++-
editeng/source/editeng/edtspell.hxx | 27 +++---
sw/source/core/doc/docedt.cxx | 34 +---
3 files changed, 107 insertions(+), 50 deletions(-)
New commits:
commit 7628ced726c4de4bb9c98675c1ff77f5b7762ab6
Author: Bartosz Kosiorek gan...@poczta.onet.pl
Date: Sun Mar 25 23:46:01 2012 +0200
Convert SV_PTRARR_DEL to boost::ptr_vector
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 6c73ba1..c805779 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -161,9 +161,7 @@ struct _SaveRedline
}
};
-SV_DECL_PTRARR_DEL( _SaveRedlines, _SaveRedline*, 0 )
-
-SV_IMPL_PTRARR( _SaveRedlines, _SaveRedline* )
+typedef boost::ptr_vector _SaveRedline _SaveRedlines;
bool lcl_MayOverwrite( const SwTxtNode *pNode, const xub_StrLen nPos )
{
@@ -532,7 +530,7 @@ void lcl_SaveRedlines( const SwPaM aPam, _SaveRedlines
rArr )
// save the current redline
_SaveRedline* pSave = new _SaveRedline( pCurrent, *pStart );
-rArr.C40_INSERT( _SaveRedline, pSave, rArr.Count() );
+rArr.push_back( pSave );
}
}
@@ -545,11 +543,10 @@ void lcl_RestoreRedlines( SwDoc* pDoc, const SwPosition
rPos, _SaveRedlines rA
RedlineMode_t eOld = pDoc-GetRedlineMode();
pDoc-SetRedlineMode_intern( (RedlineMode_t)(( eOld
~nsRedlineMode_t::REDLINE_IGNORE) | nsRedlineMode_t::REDLINE_ON ));
-for( sal_uInt16 n = 0; n rArr.Count(); ++n )
+for( size_t n = 0; n rArr.size(); ++n )
{
-_SaveRedline* pSave = rArr[ n ];
-pSave-SetPos( rPos );
-pDoc-AppendRedline( pSave-pRedl, true );
+rArr[ n ].SetPos( rPos );
+pDoc-AppendRedline( rArr[ n ].pRedl, true );
}
pDoc-SetRedlineMode_intern( eOld );
@@ -590,7 +587,7 @@ void lcl_SaveRedlines( const SwNodeRange rRg,
_SaveRedlines rArr )
pTmpPos-nNode.GetNode().GetCntntNode(), 0 );
_SaveRedline* pSave = new _SaveRedline( pNewRedl, rRg.aStart );
-rArr.C40_INSERT( _SaveRedline, pSave, rArr.Count() );
+rArr.push_back( pSave );
pTmpPos = pTmp-End();
pTmpPos-nNode = rRg.aEnd;
@@ -613,7 +610,7 @@ void lcl_SaveRedlines( const SwNodeRange rRg,
_SaveRedlines rArr )
{
// move everything
_SaveRedline* pSave = new _SaveRedline( pTmp, rRg.aStart );
-rArr.C40_INSERT( _SaveRedline, pSave, rArr.Count() );
+rArr.push_back( pSave );
}
else
{
@@ -625,7 +622,7 @@ void lcl_SaveRedlines( const SwNodeRange rRg,
_SaveRedlines rArr )
pTmpPos-nNode.GetNode().GetCntntNode(), 0 );
_SaveRedline* pSave = new _SaveRedline( pNewRedl, rRg.aStart );
-rArr.C40_INSERT( _SaveRedline, pSave, rArr.Count() );
+rArr.push_back( pSave );
pTmpPos = pTmp-Start();
pTmpPos-nNode = rRg.aEnd;
@@ -646,11 +643,10 @@ void lcl_RestoreRedlines( SwDoc* pDoc, sal_uInt32
nInsPos, _SaveRedlines rArr )
RedlineMode_t eOld = pDoc-GetRedlineMode();
pDoc-SetRedlineMode_intern( (RedlineMode_t)(( eOld
~nsRedlineMode_t::REDLINE_IGNORE) | nsRedlineMode_t::REDLINE_ON ));
-for( sal_uInt16 n = 0; n rArr.Count(); ++n )
+for( size_t n = 0; n rArr.size(); ++n )
{
-_SaveRedline* pSave = rArr[ n ];
-pSave-SetPos( nInsPos );
-pDoc-AppendRedline( pSave-pRedl, true );
+rArr[ n ].SetPos( nInsPos );
+pDoc-AppendRedline( rArr[ n ].pRedl, true );
}
pDoc-SetRedlineMode_intern( eOld );
@@ -880,7 +876,7 @@ bool SwDoc::MoveRange( SwPaM rPaM, SwPosition rPos,
SwMoveFlags eMvFlags )
_SaveFlyInRange( rPaM, rPos.nNode, aSaveFlyArr, 0 != ( DOC_MOVEALLFLYS
eMvFlags ) );
// save redlines (if DOC_MOVEREDLINES is used)
-_SaveRedlines aSaveRedl( 0 );
+_SaveRedlines aSaveRedl;
if( DOC_MOVEREDLINES eMvFlags GetRedlineTbl().Count() )
{
lcl_SaveRedlines( rPaM, aSaveRedl );
@@ -1084,7 +1080,7 @@ bool SwDoc::MoveRange( SwPaM rPaM, SwPosition rPos,
SwMoveFlags eMvFlags )
_RestFlyInRange( aSaveFlyArr, rPaM.Start()-nNode, (rPos.nNode) );
// restore redlines (if DOC_MOVEREDLINES is used)
-if( aSaveRedl.Count() )
+if( !aSaveRedl.empty() )
{
lcl_RestoreRedlines( this, *aSavePam.Start(), aSaveRedl );
}
@@ -1129,7 +1125,7 @@ bool SwDoc::MoveNodeRange( SwNodeRange rRange,
SwNodeIndex rPos,
GetFtnIdxs(), aTmpFntIdx );
}
-_SaveRedlines aSaveRedl( 0 );
+_SaveRedlines aSaveRedl;
SvPtrarr aSavRedlInsPosArr( 0 );
if( DOC_MOVEREDLINES eMvFlags GetRedlineTbl().Count() )
{
@@ -1212,7 +1208,7 @@ bool SwDoc::MoveNodeRange( SwNodeRange rRange,
[Libreoffice-commits] .: 2 commits - cui/source sw/source
cui/source/tabpages/tpline.cxx | 141 +++-
sw/source/core/text/atrstck.cxx |2
sw/source/core/text/blink.cxx | 23 +++---
3 files changed, 82 insertions(+), 84 deletions(-)
New commits:
commit bfa1547570add919754cba82d0ca1062eabfb6dd
Author: Philipp Weissenbacher p.weissenbac...@gmail.com
Date: Tue Mar 27 21:31:31 2012 +0200
Translate German comments, fix some English ones
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index ede160b..2fb8f89 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -116,9 +116,9 @@ SvxLineTabPage::SvxLineTabPage
pSymbolList(NULL),
bNewSize(false),
nNumMenuGalleryItems(0),
-nSymbolType(SVX_SYMBOLTYPE_UNKNOWN), //unbekannt bzw. unchanged
+nSymbolType(SVX_SYMBOLTYPE_UNKNOWN), // unknown respectively unchanged
pSymbolAttr(NULL),
-//#58425# Symbole auf einer Linie (z.B. StarChart)
+//#58425# Symbols on a line (e.g. StarChart)
aFlSymbol ( this, CUI_RES(FL_SYMBOL_FORMAT)),
aSymbolMB ( this, CUI_RES(MB_SYMBOL_BITMAP)),
aSymbolWidthFT ( this, CUI_RES(FT_SYMBOL_WIDTH)),
@@ -181,7 +181,7 @@ SvxLineTabPage::SvxLineTabPage
aMtrStartWidth.SetSpinSize( 2 );
aMtrEndWidth.SetSpinSize( 2 );
break;
-default: ;//prevent warning
+default: ;// prevent warning
}
SetFieldUnit( aMtrLineWidth, eFUnit );
SetFieldUnit( aMtrStartWidth, eFUnit );
@@ -189,7 +189,7 @@ SvxLineTabPage::SvxLineTabPage
// PoolUnit ermitteln
SfxItemPool* pPool = rOutAttrs.GetPool();
-DBG_ASSERT( pPool, Wo ist der Pool? );
+DBG_ASSERT( pPool, Where is the pool? );
ePoolUnit = pPool-GetMetric( SID_ATTR_LINE_WIDTH );
aLbLineStyle.SetSelectHdl(
@@ -229,7 +229,7 @@ SvxLineTabPage::SvxLineTabPage
void SvxLineTabPage::ShowSymbolControls(sal_Bool bOn)
{
-// Symbols on a line (eg star charts), symbol-enable controls
+// Symbols on a line (e.g. StarCharts), symbol-enable controls
bSymbols=bOn;
aSymbolWidthFT.Show(bOn);
@@ -244,7 +244,7 @@ void SvxLineTabPage::ShowSymbolControls(sal_Bool bOn)
SvxLineTabPage::~SvxLineTabPage()
{
-//Symbols on a line (eg star charts), dtor new!
+// Symbols on a line (e.g. StarCharts), dtor new!
delete aSymbolMB.GetPopupMenu()-GetPopupMenu( MN_GALLERY );
@@ -267,10 +267,10 @@ void SvxLineTabPage::Construct()
void SvxLineTabPage::InitSymbols(MenuButton* pButton)
{
-//Popup initialisieren
+// Initialize popup
if(!pButton-GetPopupMenu()-GetPopupMenu( MN_GALLERY ))
{
-// Gallery-Eintraege besorgen
+// Get gallery entries
GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, aGrfNames);
PopupMenu* pPopup = new PopupMenu;
@@ -282,7 +282,7 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton)
{
pUIName = (*it);
-// convert URL encodings to UI characters (eg %20 for spaces)
+// Convert URL encodings to UI characters (e.g. %20 for spaces)
rtl::OUString aPhysicalName;
if (utl::LocalFileHelper::ConvertURLToPhysicalName(*it,
aPhysicalName))
{
@@ -350,7 +350,7 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton)
rtl::OUString aEmptyStr;
// Generate invisible square to give all symbols a
-// bitmap size, which is indepedent from specific glyph
+// bitmap size, which is independent from specific glyph
SdrObject *pInvisibleSquare=pSymbolList-GetObj(0);
pInvisibleSquare=pInvisibleSquare-Clone();
pPage-NbcInsertObject(pInvisibleSquare);
@@ -430,7 +430,7 @@ void SvxLineTabPage::SymbolSelected(MenuButton* pButton)
{
if( (nItemId-MN_GALLERY_ENTRY) = nNumMenuGalleryItems)
{
-nSymbolType=nItemId-MN_GALLERY_ENTRY-nNumMenuGalleryItems; //Index
der Liste
+nSymbolType=nItemId-MN_GALLERY_ENTRY-nNumMenuGalleryItems; //
List's index
}
else
{
@@ -464,7 +464,7 @@ void SvxLineTabPage::SymbolSelected(MenuButton* pButton)
aGrfDlg.AsLink(false);
if( !aGrfDlg.Execute() )
{
-// ausgewaehlten Filter merken
+// Remember selected filters
if( !aGrfDlg.GetGraphic(aGraphic) )
{
nSymbolType=SVX_SYMBOLTYPE_BRUSHITEM;
@@ -570,7 +570,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet rSet )
nCount = aLbLineStyle.GetEntryCount();
if ( nCount == 0 )
-; // Dieser Fall sollte nicht auftreten
+; // This case should never occur
else if( nCount = nPos )
aLbLineStyle.SelectEntryPos( 0 );
else
@@ -582,7 +582,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet rSet )
aDashURL.Append(
[Libreoffice-commits] .: l10ntools/inc l10ntools/source unusedcode.easy
l10ntools/inc/xmlparse.hxx|6
l10ntools/source/xmlparse.cxx | 61 --
unusedcode.easy |2 -
3 files changed, 69 deletions(-)
New commits:
commit a84e97e58fe0915376801f98e1c0d24470f1e1d3
Author: Santiago Martinez smvar...@gmail.com
Date: Tue Mar 27 21:16:50 2012 +0200
Remove unused code in l10ntools.
diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx
index cd9bc2b..0731a9f 100644
--- a/l10ntools/inc/xmlparse.hxx
+++ b/l10ntools/inc/xmlparse.hxx
@@ -169,13 +169,7 @@ public:
XMLChildNode *pChild , size_t pos /// the new child
);
-int RemoveChild( XMLElement *pRefElement );
void RemoveAndDeleteAllChildren();
-
-/// returns a child element which matches the given one
-XMLElement *GetChildElement(
-XMLElement *pRefElement // the reference elelement
-);
};
//-
diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index e646308..5be1f0e 100644
--- a/l10ntools/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.cxx
@@ -159,37 +159,6 @@ void XMLParentNode::AddChild( XMLChildNode *pChild ,
size_t pos )
}
/*/
-int XMLParentNode::RemoveChild( XMLElement *pRefElement )
-/*/
-{
-XMLElement* a;
-if ( pChildList ){
-for ( size_t i = 0; i pChildList-size(); i++ ) {
-XMLChildNode *pChild = (*pChildList)[ i ];
-if ( pChild-GetNodeType() == XML_NODE_TYPE_ELEMENT ){
-a = static_castXMLElement* (pChild);
-rtl::OString elemid(a-GetId().toAsciiLowerCase());
-rtl::OString elemLID(a-GetLanguageId().toAsciiLowerCase());
-rtl::OString pRefLID(
-pRefElement-GetLanguageId().toAsciiLowerCase());
-if (elemid == pRefElement-GetId() elemLID == pRefLID)
-{
-if( pRefElement-ToOString().compareTo( a-ToOString()
)==0 ){
-XMLChildNodeList::iterator it = pChildList-begin();
-::std::advance( it, i );
-pChildList-erase( it );
-delete a; // Test
-return i;
-}
-}
-}
-
-}
-}
-return -1;
-}
-
-/*/
void XMLParentNode::RemoveAndDeleteAllChildren(){
/*/
if ( pChildList ) {
@@ -199,36 +168,6 @@ void XMLParentNode::RemoveAndDeleteAllChildren(){
}
}
-/*/
-XMLElement *XMLParentNode::GetChildElement( XMLElement *pRefElement )
-/*/
-{
-for ( size_t i = 0; i pChildList-size(); i++ ) {
-XMLChildNode *pChild = (*pChildList)[ i ];
-if ( pChild-GetNodeType() == XML_NODE_TYPE_ELEMENT )
-if ((( XMLElement * ) pChild )-GetName() ==
-pRefElement-GetName())
-{
-XMLAttributeList *pList = pRefElement-GetAttributeList();
-if ( !pList )
-return ( XMLElement * ) pChild;
-
-sal_Bool bMatch = sal_False;
-for ( size_t j = 0; j pList-size() bMatch; j++ ) {
-XMLAttribute *pAttribute = (*pList)[ j ];
-XMLAttribute *pCandidate =
-(( XMLElement * ) pChild )-GetAttribute(
-pAttribute-GetName() );
-if ( !pCandidate || !pAttribute-IsEqual( *pCandidate ))
-bMatch = sal_False;
-}
-if ( bMatch )
-return ( XMLElement * ) pChild;
-}
-}
-return NULL;
-}
-
//
// class XMLFile
//
diff --git a/unusedcode.easy b/unusedcode.easy
index 54ba512..79a729f 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -341,8 +341,6 @@ XMLFontAutoStylePoolNames_Impl::Remove(rtl::OUString*)
XMLFontAutoStylePool_Impl::GetPos(XMLFontAutoStylePoolEntry_Impl const*) const
XMLFontAutoStylePool_Impl::Remove(XMLFontAutoStylePoolEntry_Impl*)
XMLParentNode::AddChild(XMLChildNode*, unsigned long)
-XMLParentNode::GetChildElement(XMLElement*)
-XMLParentNode::RemoveChild(XMLElement*)
XMLPropertyBackpatcherrtl::OUString::XMLPropertyBackpatcher(char const*)
XMLPropertyBackpatcherrtl::OUString::XMLPropertyBackpatcher(char const*,
char const*, unsigned char, rtl::OUString)
XMLPropertyBackpatcherrtl::OUString::XMLPropertyBackpatcher(rtl::OUString
const, rtl::OUString const, unsigned char, rtl::OUString)
[Libreoffice-commits] .: cui/source
cui/source/tabpages/bbdlg.cxx|3 -
cui/source/tabpages/tabline.cxx | 18 ---
cui/source/tabpages/tabstpge.cxx | 63 ++-
3 files changed, 39 insertions(+), 45 deletions(-)
New commits:
commit dfdd09fa867cfddb6c09a85028e73287b3e5c9b2
Author: Philipp Weissenbacher p.weissenbac...@gmail.com
Date: Tue Mar 27 21:53:19 2012 +0200
Translate German comments
diff --git a/cui/source/tabpages/bbdlg.cxx b/cui/source/tabpages/bbdlg.cxx
index 3133b2f..1320f7d 100644
--- a/cui/source/tabpages/bbdlg.cxx
+++ b/cui/source/tabpages/bbdlg.cxx
@@ -61,8 +61,7 @@ SvxBorderBackgroundDlg::~SvxBorderBackgroundDlg()
void SvxBorderBackgroundDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage
rTabPage )
{
-// Umschalten zwischen Farbe/Grafik ermoeglichen:
-
+// Make it possible to switch between color/graphic:
if ( bEnableBackgroundSelector (RID_SVXPAGE_BACKGROUND == nPageId) )
((SvxBackgroundTabPage)rTabPage).ShowSelector( );
}
diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx
index 5a978ff..286cb33 100644
--- a/cui/source/tabpages/tabline.cxx
+++ b/cui/source/tabpages/tabline.cxx
@@ -68,8 +68,7 @@ SvxLineTabDialog::SvxLineTabDialog
nLineEndListState( CT_NONE ),
nDashListState( CT_NONE ),
mnColorListState( CT_NONE ),
-nPageType( 0 ), // wird hier in erster Linie benutzt, um mit FillItemSet
- // die richtigen Attribute zu erhalten ( noch Fragen? )
+nPageType( 0 ), // We use it here primarily to get the right attributes
with FillItemSet
nDlgType( 0 ),
nPosDashLb( 0 ),
nPosLineEndLb( 0 ),
@@ -145,7 +144,7 @@ void SvxLineTabDialog::SavePalettes()
pLineEndList = pDrawModel-GetLineEndList();
}
-// Speichern der Tabellen, wenn sie geaendert wurden.
+// Save the tables when they have been changed
const String aPath( SvtPathOptions().GetPalettePath() );
@@ -154,7 +153,7 @@ void SvxLineTabDialog::SavePalettes()
pDashList-SetPath( aPath );
pDashList-Save();
-// ToolBoxControls werden benachrichtigt:
+// Notify ToolBoxControls
if ( pShell )
pShell-PutItem( SvxDashListItem( pDashList, SID_DASH_LIST ) );
}
@@ -164,7 +163,7 @@ void SvxLineTabDialog::SavePalettes()
pLineEndList-SetPath( aPath );
pLineEndList-Save();
-// ToolBoxControls werden benachrichtigt:
+// Notify ToolBoxControls
if ( pShell )
pShell-PutItem( SvxLineEndListItem( pLineEndList,
SID_LINEEND_LIST ) );
}
@@ -174,7 +173,7 @@ void SvxLineTabDialog::SavePalettes()
pColorList-SetPath( aPath );
pColorList-Save();
-// ToolBoxControls werden benachrichtigt:
+// Notify ToolBoxControls
if ( pShell )
pShell-PutItem( SvxColorListItem( pColorList, SID_COLOR_TABLE ) );
}
@@ -186,9 +185,8 @@ short SvxLineTabDialog::Ok()
{
SavePalettes();
-// Es wird RET_OK zurueckgeliefert, wenn wenigstens eine
-// TabPage in FillItemSet() sal_True zurueckliefert. Dieses
-// geschieht z.Z. standardmaessig.
+// We return RET_OK if at least one TabPage in FillItemSet() returns
sal_True.
+// We do this by default at the moment.
return( SfxTabDialog::Ok() );
}
@@ -222,7 +220,7 @@ void SvxLineTabDialog::PageCreated( sal_uInt16 nId,
SfxTabPage rPage )
( (SvxLineTabPage) rPage ).SetObjSelected( bObjSelected );
( (SvxLineTabPage) rPage ).Construct();
( (SvxLineTabPage) rPage ).SetColorChgd( mnColorListState );
-// ActivatePage() wird das erste mal nicht gerufen
+// ActivatePage() is not called the first time
( (SvxLineTabPage) rPage ).ActivatePage( rOutAttrs );
break;
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index 517ff45..3295496 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -72,7 +72,7 @@ static sal_uInt16 pRanges[] =
0
};
-// C-Funktion
+// C function
void FillUpWithDefTabs_Impl( long nDefDist, SvxTabStopItem rTabs )
{
@@ -88,7 +88,7 @@ void FillUpWithDefTabs_Impl( long nDefDist, SvxTabStopItem
rTabs )
void TabWin_Impl::Paint( const Rectangle )
{
-// Tabulatoren malen
+// Paint tabulators
Point aPnt;
Size aSize = GetOutputSizePixel();
aPnt.X() = aSize.Width() / 2;
@@ -143,15 +143,15 @@ SvxTabulatorTabPage::SvxTabulatorTabPage( Window* pParent,
}
aFillChar.SetAccessibleName(String(CUI_RES( ST_FILLCHAR_OTHER )));
-// diese Page braucht ExchangeSupport
+// This page needs ExchangeSupport
SetExchangeSupport();
-// Metrik einstellen
+// Set metric
FieldUnit eFUnit = GetModuleFieldUnit( rAttr );
SetFieldUnit( aTabBox,
[Libreoffice-commits] .: bridges/source
bridges/source/cpp_uno/mingw_intel/share.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9e46c8fcb85157b9f3e301e9a500c55f807526d4 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Mar 27 22:26:05 2012 +0200 2nd param of __cxa_throw is void* in GCC = 4.6 diff --git a/bridges/source/cpp_uno/mingw_intel/share.hxx b/bridges/source/cpp_uno/mingw_intel/share.hxx index e6e4337..58fb72d 100644 --- a/bridges/source/cpp_uno/mingw_intel/share.hxx +++ b/bridges/source/cpp_uno/mingw_intel/share.hxx @@ -83,7 +83,7 @@ extern C CPPU_CURRENT_NAMESPACE::__cxa_eh_globals *__cxa_get_globals () throw( extern C void *__cxa_allocate_exception( std::size_t thrown_size ) throw(); extern C void __cxa_throw ( -void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn)); +void *thrown_exception, void *tinfo, void (*dest) (void *) ) __attribute__((noreturn)); #endif namespace CPPU_CURRENT_NAMESPACE ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - editeng/source filter/inc filter/source l10ntools/source sc/source sd/source svx/source sw/source unusedcode.easy
editeng/source/items/paraitem.cxx |2
filter/inc/filter/msfilter/svdfppt.hxx |2
filter/source/msfilter/svdfppt.cxx |2
l10ntools/source/localize.cxx |1
sc/source/filter/inc/addressconverter.hxx | 16 --
sc/source/filter/inc/biffdetector.hxx | 38 -
sc/source/filter/inc/biffoutputstream.hxx |2
sc/source/filter/inc/drawingmanager.hxx |2
sc/source/filter/inc/excelfilter.hxx| 17 --
sc/source/filter/inc/ooxformulaparser.hxx | 111
sc/source/filter/oox/addressconverter.cxx | 29
sc/source/filter/oox/biffdetector.cxx | 81 ---
sc/source/filter/oox/biffoutputstream.cxx |8 -
sc/source/filter/oox/drawingmanager.cxx | 25 ---
sc/source/filter/oox/excelfilter.cxx| 53 ---
sc/source/filter/oox/ooxformulaparser.cxx | 90
sc/source/filter/oox/sheetdatabuffer.cxx| 75 --
sd/source/filter/eppt/epptso.cxx|4
sd/source/filter/ppt/pptin.cxx | 17 +-
svx/source/accessibility/svxrectctaccessiblecontext.cxx |6
sw/source/core/layout/paintfrm.cxx | 22 +--
unusedcode.easy |8 -
22 files changed, 48 insertions(+), 563 deletions(-)
New commits:
commit 9cab649ccb3d827258e95a9b5c91d4b726564d89
Author: Caolán McNamara caol...@redhat.com
Date: Tue Mar 27 22:36:52 2012 +0100
Resolves: fdo#47865 insertions into deque invalidate nLastCount
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 286908a..beb44dd 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -191,9 +191,9 @@ public:
class SwLineRects : public std::deque SwLineRect
{
-std::deque SwLineRect ::iterator nLastCount; //avoid unnecessary cycles
in PaintLines
+size_t nLastCount; //avoid unnecessary cycles in PaintLines
public:
-SwLineRects() : nLastCount( this-begin() ) {}
+SwLineRects() : nLastCount( 0 ) {}
void AddLineRect( const SwRect rRect, const Color *pColor, const
SvxBorderStyle nStyle,
const SwTabFrm *pTab, const sal_uInt8 nSCol );
void ConnectEdges( OutputDevice *pOut );
@@ -827,7 +827,7 @@ void SwLineRects::PaintLines( OutputDevice *pOut )
{
// Paint the borders. Sadly two passes are needed.
// Once for the inside and once for the outside edges of tables
-if ( this-end() != nLastCount )
+if ( this-size() != nLastCount )
{
// #i16816# tagged pdf support
SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, 0, *pOut );
@@ -839,18 +839,18 @@ void SwLineRects::PaintLines( OutputDevice *pOut )
const Color *pLast = 0;
sal_Bool bPaint2nd = sal_False;
-SwLineRects::iterator nMinCount = this-end();
+size_t nMinCount = this-size();
-for (SwLineRects::iterator it = this-begin(); it != this-end(); ++it)
+for ( size_t i = 0; i size(); ++i )
{
-SwLineRect rLRect = *it;
+SwLineRect rLRect = operator[](i);
if ( rLRect.IsPainted() )
continue;
if ( rLRect.IsLocked() )
{
-nMinCount = Min( nMinCount, it );
+nMinCount = Min( nMinCount, i );
continue;
}
@@ -905,15 +905,16 @@ void SwLineRects::PaintLines( OutputDevice *pOut )
bPaint2nd = sal_True;
}
if ( bPaint2nd )
-for (SwLineRects::iterator it = this-begin(); it != this-end();
++it)
+{
+for ( size_t i = 0; i size(); ++i )
{
-SwLineRect rLRect = *it;
+SwLineRect rLRect = operator[](i);
if ( rLRect.IsPainted() )
continue;
if ( rLRect.IsLocked() )
{
-nMinCount = Min( nMinCount, it );
+nMinCount = Min( nMinCount, i );
continue;
}
@@ -935,6 +936,7 @@ void SwLineRects::PaintLines( OutputDevice *pOut )
lcl_DrawDashedRect( pOut, rLRect );
rLRect.SetPainted();
}
+}
nLastCount = nMinCount;
pOut-Pop();
}
commit 919f7104b51b156db34787eb7bd5f16e4ecfb633
Author: Caolán McNamara caol...@redhat.com
Date: Tue Mar 27 22:02:36 2012 +0100
drop intermediate temporary UniStrings
diff --git a/editeng/source/items/paraitem.cxx
b/editeng/source/items/paraitem.cxx
index d7736d1..b1ab1fd 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -887,7 +887,7 @@
[Libreoffice-commits] .: sal/qa
sal/qa/osl/process/osl_process.cxx | 72 ++---
1 file changed, 36 insertions(+), 36 deletions(-)
New commits:
commit 533eadeb46c3db40daf0f18f89096c24e7f9c2bd
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Wed Mar 28 06:26:58 2012 +0200
CPPUNIT_ASSERT_MESSAGE - CPPUNIT_ASSERT_EQUAL_MESSAGE
diff --git a/sal/qa/osl/process/osl_process.cxx
b/sal/qa/osl/process/osl_process.cxx
index 367d6d9..8580ab2 100644
--- a/sal/qa/osl/process/osl_process.cxx
+++ b/sal/qa/osl/process/osl_process.cxx
@@ -159,10 +159,10 @@ public:
0,
process);
-CPPUNIT_ASSERT_MESSAGE
+CPPUNIT_ASSERT_EQUAL_MESSAGE
(
osl_createProcess failed,
-osl_error == osl_Process_E_None
+osl_Process_E_None, osl_error
);
TimeValue timeout;
@@ -171,18 +171,18 @@ public:
osl_error = osl_joinProcessWithTimeout(process, timeout);
-CPPUNIT_ASSERT_MESSAGE
+CPPUNIT_ASSERT_EQUAL_MESSAGE
(
osl_joinProcessWithTimeout returned without timeout failure,
-osl_Process_E_TimedOut == osl_error
+osl_Process_E_TimedOut, osl_error
);
osl_error = osl_terminateProcess(process);
-CPPUNIT_ASSERT_MESSAGE
+CPPUNIT_ASSERT_EQUAL_MESSAGE
(
osl_terminateProcess failed,
-osl_error == osl_Process_E_None
+osl_Process_E_None, osl_error
);
osl_freeProcessHandle(process);
@@ -209,10 +209,10 @@ public:
0,
process);
-CPPUNIT_ASSERT_MESSAGE
+CPPUNIT_ASSERT_EQUAL_MESSAGE
(
osl_createProcess failed,
-osl_error == osl_Process_E_None
+osl_Process_E_None, osl_error
);
TimeValue timeout;
@@ -221,10 +221,10 @@ public:
osl_error = osl_joinProcessWithTimeout(process, timeout);
-CPPUNIT_ASSERT_MESSAGE
+CPPUNIT_ASSERT_EQUAL_MESSAGE
(
osl_joinProcessWithTimeout returned with failure,
-osl_Process_E_None == osl_error
+osl_Process_E_None, osl_error
);
osl_freeProcessHandle(process);
@@ -249,18 +249,18 @@ public:
0,
process);
-CPPUNIT_ASSERT_MESSAGE
+CPPUNIT_ASSERT_EQUAL_MESSAGE
(
osl_createProcess failed,
-osl_error == osl_Process_E_None
+osl_Process_E_None, osl_error
);
osl_error = osl_joinProcessWithTimeout(process, NULL);
-CPPUNIT_ASSERT_MESSAGE
+CPPUNIT_ASSERT_EQUAL_MESSAGE
(
osl_joinProcessWithTimeout returned with failure,
-osl_Process_E_None == osl_error
+osl_Process_E_None, osl_error
);
osl_freeProcessHandle(process);
@@ -285,18 +285,18 @@ public:
0,
process);
-CPPUNIT_ASSERT_MESSAGE
+CPPUNIT_ASSERT_EQUAL_MESSAGE
(
osl_createProcess failed,
-osl_error == osl_Process_E_None
+osl_Process_E_None, osl_error
);
osl_error = ::osl_joinProcess(process);
-CPPUNIT_ASSERT_MESSAGE
+CPPUNIT_ASSERT_EQUAL_MESSAGE
(
osl_joinProcess returned with failure,
-osl_Process_E_None == osl_error
+osl_Process_E_None, osl_error
);
osl_freeProcessHandle(process);
@@ -450,11 +450,11 @@ public:
OUString create_temp_file(OUString temp_file_url)
{
FileBase::RC rc = FileBase::createTempFile(0, 0, temp_file_url);
-CPPUNIT_ASSERT_MESSAGE(createTempFile failed, FileBase::E_None ==
rc);
+CPPUNIT_ASSERT_EQUAL_MESSAGE(createTempFile failed,
FileBase::E_None, rc);
OUString temp_file_path;
rc = FileBase::getSystemPathFromFileURL(temp_file_url, temp_file_path);
-CPPUNIT_ASSERT_MESSAGE(getSystemPathFromFileURL failed,
FileBase::E_None == rc);
+CPPUNIT_ASSERT_EQUAL_MESSAGE(getSystemPathFromFileURL failed,
FileBase::E_None, rc);
return temp_file_path;
}
@@ -584,18 +584,18 @@ public:
0,
process);
-CPPUNIT_ASSERT_MESSAGE
+CPPUNIT_ASSERT_EQUAL_MESSAGE
(
osl_createProcess failed,
-osl_error == osl_Process_E_None
+osl_Process_E_None, osl_error
);
osl_error = ::osl_joinProcess(process);
-CPPUNIT_ASSERT_MESSAGE
+CPPUNIT_ASSERT_EQUAL_MESSAGE
(
osl_joinProcess returned with failure,
-osl_Process_E_None == osl_error
+osl_Process_E_None, osl_error
);
osl_freeProcessHandle(process);
@@ -638,18 +638,18 @@ public:
SAL_N_ELEMENTS(child_env),
process);
-CPPUNIT_ASSERT_MESSAGE
+CPPUNIT_ASSERT_EQUAL_MESSAGE
(
