[Libreoffice-commits] .: more_fonts/fonts ooo.lst.in

[Andras Timar]

 more_fonts/fonts/ttf_linlibertineg/makefile.mk |4 ++--
 ooo.lst.in |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 9c34d4a80b4b1a2c2275a9dbadb138ac9490abbf
Author: Andras Timar ati...@suse.com
Date:   Mon Jan 16 11:24:56 2012 +0100

update to 20120106 release of Linux Libertine G fonts

- proper hinting for digital publishing by new ttfautohint of Freetype
  instead of Fontforge autoInstr

- fix LibreOffice crash with dotted tabulation (conflict between
  dot-to-ellipsis mechanisms), problem reported by user bolond
  on HUP.hu, and István Bobay on Libreoffice.hu

- fix proportional old style numbers leading with Euro symbol,
  problem with the first digit reported by Kim Bastin

- fix Linux Libertine G semibold Italic (missing Graphite features)

- sups uses hyphen.sups replacement for hyphen instead of minus.superior
  (use explicit minus sign or feature texm: texm keeps minus.superior
  for hyphen input, like TeX)

- new feature: litt, optional switch for the default tt ligature

- fix f] and f' (typographic apostrophe) kerning in Linux Libertine
  Italic

- remove bad ligc replacement in superiors and inferiors

diff --git a/more_fonts/fonts/ttf_linlibertineg/makefile.mk 
b/more_fonts/fonts/ttf_linlibertineg/makefile.mk
index 63ff8d8..997fc7b 100644
--- a/more_fonts/fonts/ttf_linlibertineg/makefile.mk
+++ b/more_fonts/fonts/ttf_linlibertineg/makefile.mk
@@ -36,8 +36,8 @@ TARGET=ttf_linlibertineg
 
 # --- Files 
 
-TARFILE_NAME=LinLibertineG-20110922
-TARFILE_MD5=30c468d0c27ae4784195b53f78bc6f64
+TARFILE_NAME=LinLibertineG-20120116
+TARFILE_MD5=e7a384790b13c29113e22e596ade9687
 TARFILE_ROOTDIR=LinLibertineG
 
 PATCH_FILES=
diff --git a/ooo.lst.in b/ooo.lst.in
index 5bd04db..1d40fcb 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -89,7 +89,7 @@ f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
 3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz
 adb5c5c8398fd89ebee2d9b4e90e061e-libvisio-0.0.13.tar.bz2
-30c468d0c27ae4784195b53f78bc6f64-LinLibertineG-20110922.zip
+e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
 cc8eb870d6a324d36575420efd856319-libcdr-0.0.0.tar.bz2
 @GOOGLE_DOCS_EXTENSION_PACK@
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: vcl/inc vcl/unx

[Caolán McNamara]

 vcl/inc/unx/saldisp.hxx |2 +-
 vcl/unx/generic/app/saldisp.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b0f254fa1e1cb916fa21234603578de701f75e83
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Jan 16 10:30:36 2012 +

WaE: getXScreen is an unsigned int now

diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 984726d..ea7dfa7 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -375,7 +375,7 @@ public:
 virtual ScreenData   *initScreen( SalX11Screen nXScreen ) const;
 const ScreenData getDataForScreen( SalX11Screen nXScreen ) const
 {
-if( nXScreen.getXScreen() = static_castint(m_aScreens.size()) )
+if( nXScreen.getXScreen() = static_castunsigned 
int(m_aScreens.size()) )
 return m_aInvalidScreenData;
 if( ! m_aScreens[nXScreen.getXScreen()].m_bInit )
 initScreen( nXScreen );
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index c3d5f79..f361961 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -525,7 +525,7 @@ void SalX11Display::PostUserEvent()
 SalDisplay::ScreenData *
 SalDisplay::initScreen( SalX11Screen nXScreen ) const
 {
-if( nXScreen.getXScreen() = static_castint(m_aScreens.size()) )
+if( nXScreen.getXScreen() = static_castunsigned int(m_aScreens.size()) )
 nXScreen = m_nXDefaultScreen;
 ScreenData* pSD = const_castScreenData 
*(m_aScreens[nXScreen.getXScreen()]);
 if( pSD-m_bInit )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sw/source

[Michael Meeks]

 sw/source/ui/index/cnttab.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 36f83debd1b8a200515fafdf66bdd7a4aec01ad5
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date:   Fri Jan 13 16:08:17 2012 +0100

fdo#38515: Fixed crasher in dialog destructor

Signed-off-by: Michael Meeks michael.me...@suse.com

diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index ae7dfad..fcfb2f8 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -358,6 +358,9 @@ SwMultiTOXTabDialog::~SwMultiTOXTabDialog()
 {
 
SW_MOD()-GetModuleConfig()-SetShowIndexPreview(aShowExampleCB.IsChecked());
 
+// fdo#38515 Avoid setting focus on deleted controls in the destructors
+EnableInput( sal_False );
+
 for(sal_uInt16 i = 0; i  nTypeCount; i++)
 {
 delete pFormArr[i];
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

[Matus Kukan]

 solenv/gbuild/platform/WNT_INTEL_MSC.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9847c3ec4dc276f52fd06b59dd8101506fe84cd9
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Mon Jan 16 12:40:02 2012 +0100

gbuild: WNT_INTEL_MSC: replace also // with / in the path

Motivation behind this is to fix processing of idl files.
When LibO directory is toplevel disk directory, there are
two // in the path which could be the reason idlc fails.

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index e0d6f12..af59807 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -247,11 +247,12 @@ gb_Helper_set_ld_path := PATH=$${PATH}:$(OUTDIR)/bin
 # does some real work only on windows, make sure not to
 # break the dummy implementations on unx*
 define gb_Helper_convert_native
+$(subst //,/, \
 $(subst $(REPODIR),$(gb_Helper_REPODIR_NATIVE), \
 $(subst $(SRCDIR),$(gb_Helper_SRCDIR_NATIVE), \
 $(subst $(WORKDIR),$(gb_Helper_WORKDIR_NATIVE), \
 $(subst $(OUTDIR),$(gb_Helper_OUTDIR_NATIVE), \
-$(1)
+$(1))
 endef
 
 # YaccTarget class
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - vcl/inc vcl/unx

[Thomas Arnhold]

 vcl/inc/unx/saldisp.hxx |   12 +++
 vcl/unx/generic/app/saldisp.cxx |  127 
 2 files changed, 139 insertions(+)

New commits:
commit 6cef39508e8a834f694cbfb750e982c623c9bd49
Author: Thomas Arnhold tho...@arnhold.org
Date:   Mon Jan 16 12:54:27 2012 +0100

Add SOLARIS checks for SalDisplay::IsLocal()

This method is (only) used at SalDisplay::GetKeyboardName() for SOLARIS

diff --git a/unusedcode.easy b/unusedcode.easy
index c4784db..26f593d 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -194,7 +194,6 @@ SVGExport::GetGlyphPlacement() const
 SVGExport::IsUseGradient() const
 SVGExport::popClip()
 SVGExport::pushClip(basegfx::B2DPolyPolygon const)
-SalDisplay::IsLocal()
 SalGraphics::DrawBitmap(SalTwoRect const*, SalBitmap const, unsigned int, 
OutputDevice const*)
 SalGraphics::DrawNativeControlText(unsigned int, unsigned int, Rectangle 
const, unsigned int, ImplControlValue const, rtl::OUString const, 
OutputDevice const*)
 SalGraphics::drawAlphaBitmap(SalTwoRect const, SalBitmap const, SalBitmap 
const)
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index d8ee2ec..94b66dc 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -305,9 +305,13 @@ protected:
 
 srv_vendor_tmeServerVendor;
 SalWM   eWindowManager_;
+
+#if defined(SOLARIS)
 sal_BoolbLocal_;// Server==Client? Init
 // in SalDisplay::IsLocal()
 sal_BoolmbLocalIsValid; // bLocal_ is valid ?
+#endif
+
 // until x bytes
 
 XLIB_Cursor aPointerCache_[POINTER_COUNT];
@@ -375,7 +379,9 @@ public:
 XLIB_Cursor   GetPointer( int ePointerStyle );
 virtual int   CaptureMouse( SalFrame *pCapture );
 
+#if defined(SOLARIS)
 sal_BoolIsLocal();
+#endif
 
 void  Remove( XEvent   *pEvent );
 virtual ScreenData   *initScreen( SalX11Screen nXScreen ) const;
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 23ff906..71bc7db 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -228,6 +228,9 @@ static sal_Bool sal_GetVisualInfo( Display *pDisplay, XID 
nVID, XVisualInfo rVI
 
 // ---
 
+/* this stuff is used in SalDisplay::GetKeyboardName for SOLARIS */
+#if defined(SOLARIS)
+
 // check wether displaystring is in format N.M or N. or just N
 // with N and M beeing natural numbers
 static sal_Bool
@@ -342,6 +345,8 @@ sal_Bool SalDisplay::IsLocal()
 return (sal_Bool)bLocal_;
 }
 
+#endif //SOLARIS
+
 // ---
 extern C srv_vendor_t
 sal_GetServerVendor( Display *p_display )
@@ -817,9 +822,11 @@ void SalDisplay::Init()
 SetServerVendor();
 X11SalBitmap::ImplCreateCache();
 
+#if defined(SOLARIS)
 bLocal_ = sal_False; /* dont care, initialize later by
 calling SalDisplay::IsLocal() */
 mbLocalIsValid  = sal_False; /* bLocal_ is not yet initialized */
+#endif
 
 // - - - - - - - - - - Synchronize - - - - - - - - - - - - -
 if( getenv( SAL_SYNCHRONIZE ) )
commit d799ac1320fb11439566a8a6c8215cfb3db10a00
Author: Thomas Arnhold tho...@arnhold.org
Date:   Mon Jan 16 12:47:36 2012 +0100

Revert Remove unused SalDisplay::IsLocal

This reverts commit e9202ffeccdf6f669184f3f869d2e5b121bea9f3.

Conflicts:

vcl/inc/unx/saldisp.hxx

diff --git a/unusedcode.easy b/unusedcode.easy
index 26f593d..c4784db 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -194,6 +194,7 @@ SVGExport::GetGlyphPlacement() const
 SVGExport::IsUseGradient() const
 SVGExport::popClip()
 SVGExport::pushClip(basegfx::B2DPolyPolygon const)
+SalDisplay::IsLocal()
 SalGraphics::DrawBitmap(SalTwoRect const*, SalBitmap const, unsigned int, 
OutputDevice const*)
 SalGraphics::DrawNativeControlText(unsigned int, unsigned int, Rectangle 
const, unsigned int, ImplControlValue const, rtl::OUString const, 
OutputDevice const*)
 SalGraphics::drawAlphaBitmap(SalTwoRect const, SalBitmap const, SalBitmap 
const)
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 23d54bd..d8ee2ec 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -305,6 +305,10 @@ protected:
 
 srv_vendor_tmeServerVendor;
 SalWM   eWindowManager_;
+sal_BoolbLocal_;// Server==Client? Init
+// in SalDisplay::IsLocal()
+sal_BoolmbLocalIsValid; // bLocal_ is valid ?
+// until x bytes
 
 XLIB_Cursor aPointerCache_[POINTER_COUNT];
 
@@ -371,6 +375,8 @@ public:
 XLIB_Cursor   GetPointer( int ePointerStyle );
 virtual int   CaptureMouse( SalFrame *pCapture );
 
+sal_BoolIsLocal();
+
 void  Remove( XEvent   *pEvent );
 virtual ScreenData   

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source

[Markus Mohrhard]

 sc/source/ui/docshell/docsh5.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 9b7d7322401da8ce42affb9e6bd408311b383ec4
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Sun Jan 15 02:13:39 2012 +

make adjusting formulas possible for TransferTab

diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx
index d053561..b965d50 100644
--- a/sc/source/ui/docshell/docsh5.cxx
+++ b/sc/source/ui/docshell/docsh5.cxx
@@ -65,6 +65,7 @@
 #include sc.hrc
 #include waitoff.hxx
 #include sizedev.hxx
+#include clipparam.hxx
 #include basic/sbstar.hxx
 #include basic/basmgr.hxx
 
@@ -850,6 +851,12 @@ sal_uLong ScDocShell::TransferTab( ScDocShell 
rSrcDocShell, SCTAB nSrcPos,
 {
 ScDocument* pSrcDoc = rSrcDocShell.GetDocument();
 
+// set the transfered area to the copyparam to make adjusting formulas 
possible
+ScClipParam aParam;
+ScRange aRange(0, 0, nSrcPos, MAXCOL, MAXROW, nSrcPos);
+aParam.maRanges.Append(aRange);
+pSrcDoc-SetClipParam(aParam);
+
 sal_uLong nErrVal =  aDocument.TransferTab( pSrcDoc, nSrcPos, nDestPos,
 bInsertNew );   // no insert
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

[David Tardon]

 solenv/gbuild/LinkTarget.mk |   19 ++-
 solenv/gbuild/TargetLocations.mk|3 ++-
 solenv/gbuild/platform/WNT_INTEL_MSC.mk |2 +-
 solenv/gbuild/platform/com_GCC_defs.mk  |4 ++--
 4 files changed, 19 insertions(+), 9 deletions(-)

New commits:
commit cf23f57ae6bb7af689a45e0a850c3c2f67a8f810
Author: David Tardon dtar...@redhat.com
Date:   Mon Jan 16 14:55:57 2012 +0100

sort out dep problem with yacc-generated header (fdo#44707)

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index e8f9bab..227fe96 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -185,18 +185,28 @@ endif
 gb_GenCxxObject_GenCxxObject =
 
 # YaccTarget class
+
+# XXX: This is more complicated than necessary, but we cannot just use
+# the generated C++ file as the main target, because we need to let the
+# header depend on that to ensure the header is present before anything
+# tries to use it.
+
 gb_YaccTarget_get_source = $(1)/$(2).y
 
 .PHONY : $(call gb_YaccTarget_get_clean_target,%)
 $(call gb_YaccTarget_get_clean_target,%) :
$(call gb_Output_announce,$(2),$(false),YAC,3)
$(call gb_Helper_abbreviate_dirs,\
-   rm -f $(call gb_YaccTarget_get_header_target,$*) $(call 
gb_YaccTarget_get_target,$*))
+   rm -f $(call gb_YaccTarget_get_grammar_target,$*) $(call 
gb_YaccTarget_get_header_target,$*) $(call gb_YaccTarget_get_target,$*))
 
 $(call gb_YaccTarget_get_target,%) : $(call 
gb_YaccTarget_get_source,$(SRCDIR),%)
-   $(call gb_YaccTarget__command,$,$*,$@,$(call 
gb_YaccTarget_get_header_target,$*))
+   $(call gb_YaccTarget__command,$,$*,$@,$(call 
gb_YaccTarget_get_header_target,$*),$(call gb_YaccTarget_get_grammar_target,$*))
 
-gb_YaccTarget_YaccTarget =
+define gb_YaccTarget_YaccTarget
+$(call gb_YaccTarget_get_grammar_target,$(1)) :| $(call 
gb_YaccTarget_get_target,$(1))
+$(call gb_YaccTarget_get_header_target,$(1)) :| $(call 
gb_YaccTarget_get_target,$(1))
+
+endef
 
 gb_YACC := bison
 
@@ -791,13 +801,12 @@ endef
 # Add a bison grammar to the build.
 # gb_LinkTarget_add_grammar(component,grammar file)
 define gb_LinkTarget_add_grammar
+$(call gb_YaccTarget_YaccTarget,$(2))
 $(call gb_LinkTarget_add_generated_cxx_object,$(1),YaccTarget/$(2))
 $(call gb_LinkTarget_get_clean_target,$(1)) : $(call 
gb_YaccTarget_get_clean_target,$(2))
 $(call gb_LinkTarget__add_internal_headers,$(1),$(call 
gb_YaccTarget_get_header_target,$(2)))
 
-
 endef
-#$(call gb_YaccTarget_YaccTarget,$(2))
 
 # Add bison grammars to the build.
 # gb_LinkTarget_add_grammars(component,grammar file [grammar file*])
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 58b581a..59ad239 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -122,8 +122,9 @@ gb_UnoApiTarget_get_header_target = 
$(WORKDIR)/UnoApiHeaders/$(1)
 gb_WinResTarget_get_target = 
$(WORKDIR)/WinResTarget/$(1)$(gb_WinResTarget_POSTFIX)
 # workdir targets: $(1) is prefix/path
 gb_Configuration_get_target = $(WORKDIR)/Configuration/$(1).done
+gb_YaccTarget_get_grammar_target = $(WORKDIR)/YaccTarget/$(1).cxx
 gb_YaccTarget_get_header_target = $(WORKDIR)/YaccTarget/$(1).hxx
-gb_YaccTarget_get_target = $(WORKDIR)/YaccTarget/$(1).cxx
+gb_YaccTarget_get_target = $(WORKDIR)/YaccTarget/$(1).done
 gb_XcsTarget_get_target = $(WORKDIR)/XcsTarget/$(1)
 gb_XcuDataTarget_get_target = $(WORKDIR)/XcuDataTarget/$(1)
 gb_XcuLangpackTarget_get_target = $(WORKDIR)/XcuLangpackTarget/$(1)
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index af59807..b7b4e94 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -261,7 +261,7 @@ define gb_YaccTarget__command
 $(call gb_Output_announce,$(2),$(true),YAC,3)
 $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(3))  \
-   $(gb_YACC) $(T_YACCFLAGS) --defines=$(4) -o $(3) $(1) )
+   $(gb_YACC) $(T_YACCFLAGS) --defines=$(4) -o $(5) $(1)  touch $(3) )
 
 endef
 
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 9e055ed..f2bf866 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -40,7 +40,7 @@ define gb_YaccTarget__command
 $(call gb_Output_announce,$(2),$(true),YAC,3)
 $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(3))  \
-   $(gb_YACC) $(T_YACCFLAGS) -d -o $(3) $(1)  mv $(3).h $(4) )
+   $(gb_YACC) $(T_YACCFLAGS) -d -o $(5) $(1)  mv $(5).h $(4)  touch 
$(3) )
 
 endef
 
@@ -49,7 +49,7 @@ define gb_YaccTarget__command
 $(call gb_Output_announce,$(2),$(true),YAC,3)
 $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(3))  \
-   $(gb_YACC) $(T_YACCFLAGS) --defines=$(4) -o $(3) $(1) )
+   $(gb_YACC) $(T_YACCFLAGS) --defines=$(4) -o $(5) $(1)  touch $(3) )
 
 endef
 endif
___

[Libreoffice-commits] .: oox/source

[Radek Doulík]

 oox/source/ppt/pptshape.cxx |   40 
 1 file changed, 36 insertions(+), 4 deletions(-)

New commits:
commit 229b0cc0029e93fa808624d8aa4dcfa2e289b1aa
Author: Radek Doulik r...@novell.com
Date:   Mon Jan 16 15:37:23 2012 +0100

handle [more] placeholder shapes in Layout slides

 - import them as outliner shapes, so that they don't appear on regular 
slides
 - choose appropriate placeholder shapes on regular slides (Table, Picture, 
Chart, Media)

diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index dfb4a38..17ceb30 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -126,7 +126,7 @@ void PPTShape::addShape(
 const awt::Rectangle* pShapeRect,
 ::oox::drawingml::ShapeIdMap* pShapeMap )
 {
-OSL_TRACE(add shape id: %s location: %s, rtl::OUStringToOString(msId, 
RTL_TEXTENCODING_UTF8 ).getStr(), meShapeLocation == Master ? master : 
meShapeLocation == Slide ? slide : other);
+OSL_TRACE(add shape id: %s location: %s subtype: %d service: %s, 
rtl::OUStringToOString(msId, RTL_TEXTENCODING_UTF8 ).getStr(), meShapeLocation 
== Master ? master : meShapeLocation == Slide ? slide : meShapeLocation == 
Layout ? layout : other, mnSubType, rtl::OUStringToOString(msServiceName, 
RTL_TEXTENCODING_UTF8 ).getStr());
 // only placeholder from layout are being inserted
 if ( mnSubType  ( meShapeLocation == Master ) )
 return;
@@ -142,6 +142,7 @@ void PPTShape::addShape(
 if ( sServiceName != 
OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.drawing.GraphicObjectShape))
 
  sServiceName != 
OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.drawing.OLE2Shape)) )
 {
+const rtl::OUString sOutlinerShapeService( 
RTL_CONSTASCII_USTRINGPARAM( com.sun.star.presentation.OutlinerShape ) );
 OSL_TRACE(has master: %p, 
rSlidePersist.getMasterPersist().get());
 switch( mnSubType )
 {
@@ -166,7 +167,6 @@ void PPTShape::addShape(
 break;
case XML_obj :
 {
-const rtl::OUString sOutlinerShapeService( 
RTL_CONSTASCII_USTRINGPARAM( com.sun.star.presentation.OutlinerShape ) );
 sServiceName = sOutlinerShapeService;
 aMasterTextListStyle = 
rSlidePersist.getMasterPersist().get() ? 
rSlidePersist.getMasterPersist()-getBodyTextStyle() : 
rSlidePersist.getBodyTextStyle();
 }
@@ -174,7 +174,6 @@ void PPTShape::addShape(
 case XML_body :
 {
 const rtl::OUString sNotesShapeService( 
RTL_CONSTASCII_USTRINGPARAM( com.sun.star.presentation.NotesShape ) );
-const rtl::OUString sOutlinerShapeService( 
RTL_CONSTASCII_USTRINGPARAM( com.sun.star.presentation.OutlinerShape ) );
 if ( rSlidePersist.isNotesPage() )
 {
 sServiceName = sNotesShapeService;
@@ -221,8 +220,41 @@ void PPTShape::addShape(
 sServiceName = sPageShapeService;
 }
 break;
-
+case XML_chart :
+if ( meShapeLocation == Layout )
+sServiceName = sOutlinerShapeService;
+else {
+const rtl::OUString sChartService( 
RTL_CONSTASCII_USTRINGPARAM( com.sun.star.presentation.ChartShape ) );
+sServiceName = sChartService;
+}
+break;
+case XML_tbl :
+if ( meShapeLocation == Layout )
+sServiceName = sOutlinerShapeService;
+else {
+const rtl::OUString sTableService( 
RTL_CONSTASCII_USTRINGPARAM( com.sun.star.presentation.TableShape ) );
+sServiceName = sTableService;
+}
+break;
+case XML_pic :
+if ( meShapeLocation == Layout )
+sServiceName = sOutlinerShapeService;
+else {
+const rtl::OUString sGraphicObjectService( 
RTL_CONSTASCII_USTRINGPARAM( com.sun.star.presentation.GraphicObjectShape ) );
+sServiceName = sGraphicObjectService;
+}
+break;
+case XML_media :
+if ( meShapeLocation == Layout )
+sServiceName = sOutlinerShapeService;
+else {
+const rtl::OUString sMediaService( 
RTL_CONSTASCII_USTRINGPARAM( com.sun.star.presentation.MediaShape ) );
+sServiceName = 

[Libreoffice-commits] .: 5 commits - android/qa configure.in desktop/Library_deploymentmisc.mk desktop/Library_deployment.mk desktop/Module_desktop.mk desktop/prj desktop/source Library_merged.mk sdex

[Tor Lillqvist]

 Library_merged.mk |7 +
 android/qa/sc/Makefile|1 
 configure.in  |4 -
 desktop/Library_deployment.mk |   16 
+++-
 desktop/Library_deploymentmisc.mk |7 +
 desktop/Module_desktop.mk |6 -
 desktop/prj/build.lst |2 
 desktop/source/deployment/manager/dp_activepackages.cxx   |   31 
+++
 desktop/source/deployment/manager/dp_activepackages.hxx   |5 +
 desktop/source/deployment/manager/dp_extensionmanager.hxx |1 
 desktop/source/deployment/manager/dp_managerfac.cxx   |1 
 desktop/source/deployment/registry/configuration/dp_configuration.cxx |   15 
++-
 desktop/source/deployment/registry/help/dp_help.cxx   |6 +
 sdext/prj/build.lst   |2 
 sw/prj/build.lst  |2 
 swext/prj/build.lst   |2 
 tail_build/prj/build.lst  |2 
 xmlhelp/inc/makefile.mk   |   40 
--
 xmlhelp/prj/build.lst |   11 +-
 19 files changed, 94 insertions(+), 67 deletions(-)

New commits:
commit 081d76c3faa9f242e70f94a253d334e29b7e6595
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Mon Jan 16 16:42:51 2012 +0200

Attempt to manage without Berkeley DB on iOS and Android

Berkeley DB is used for help index and extension database. (Possibly
only for a backward-compatible format of the latter, I am not sure.)
Neither use makes much sense on Android and iOS.

The existing help is for LO on desktop OSes anyway, help for LO-based
apps on iOS and Android will naturally be quite different.

On iOS there will definitely be no extensions, and probably we don't
want to bother with such on Android either.

diff --git a/Library_merged.mk b/Library_merged.mk
index 9fe9c2d..b2e49b0 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -49,11 +49,16 @@ $(eval $(call gb_Library_add_linked_libs,merged,\
 ))
 
 $(eval $(call gb_Library_use_externals,merged,\
-   berkeleydb \
icuuc \
zlib \
 ))
 
+ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
+$(eval $(call gb_Library_use_externals,merged,\
+   berkeleydb \
+))
+endif
+
 # gb_MERGEDLIBS is defined in solenv/gbuild/extensions/pre_MergedLibsList.mk
 $(eval $(call gb_Library_add_library_objects,merged,\
$(gb_MERGEDLIBS) \
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index cd09db1..22d4eba 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -60,7 +60,6 @@ copy-stuff:
  bootstrap.uno \
  comphelpgcc3 \
  configmgr.uno \
- db-4.7 \
  fontconfig \
  forlo \
  foruilo \
diff --git a/configure.in b/configure.in
index 84c1dcc..1fccd1e 100644
--- a/configure.in
+++ b/configure.in
@@ -5819,10 +5819,12 @@ or install the Berkeley db development package.])
 
 SCPDEFS=$SCPDEFS -DSYSTEM_DB
 MINGW_EXTERNAL_DLLS=$MINGW_EXTERNAL_DLLS libdb-4.8.dll
-else
+elif test $_os != iOS -a $_os != Android; then
 AC_MSG_RESULT([internal])
 SYSTEM_DB=NO
 BUILD_TYPE=$BUILD_TYPE BERKELEYDB
+else
+   AC_MSG_RESULT([none])
 fi
 AC_SUBST(SYSTEM_DB)
 AC_SUBST(SYSTEM_DB_CFLAGS)
diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk
index 91561c8..7e455ef 100644
--- a/desktop/Library_deployment.mk
+++ b/desktop/Library_deployment.mk
@@ -44,7 +44,6 @@ $(eval $(call gb_Library_add_linked_libs,deployment,\
 cppu \
 cppuhelper \
 deploymentmisc \
-helplinker \
 sal \
 svl \
 tl \
@@ -54,15 +53,16 @@ $(eval $(call gb_Library_add_linked_libs,deployment,\
 $(gb_STDLIBS) \
 ))
 
+ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
 $(eval $(call gb_Library_use_externals,deployment,\
 berkeleydb \
 ))
+endif
 
 $(eval $(call 
gb_Library_set_componentfile,deployment,desktop/source/deployment/deployment))
 
 $(eval $(call gb_Library_add_exception_objects,deployment,\
 desktop/source/deployment/dp_log \
-desktop/source/deployment/dp_persmap \
 desktop/source/deployment/dp_services \
 desktop/source/deployment/dp_xml \
 desktop/source/deployment/manager/dp_activepackages \
@@ -92,4 +92,16 @@ $(eval $(call gb_Library_add_exception_objects,deployment,\
 desktop/source/deployment/registry/sfwk/dp_sfwk \
 ))
 
+ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
+
+$(eval $(call gb_Library_add_linked_libs,deployment,\
+helplinker \
+))
+
+$(eval 

[Libreoffice-commits] .: 2 commits - sc/source toolkit/source vcl/inc

[Stephan Bergmann]

 sc/source/ui/unoobj/cellsuno.cxx  |1 +
 toolkit/source/awt/vclxwindow.cxx |2 +-
 vcl/inc/vcl/svapp.hxx |   25 +++--
 3 files changed, 5 insertions(+), 23 deletions(-)

New commits:
commit 1ef1781390845d03b6e1518bbac81b818be62f3d
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Jan 16 15:49:13 2012 +0100

Revert RescheduleDuringAcquire, it leads to code being run w/o solar mutex.

6a8fd4c76a969ac98d1aff91ff7442f43aee0006 claims that 
RescheduleDuringAcquire is
necessary to prevent deadlocks, but fails to explain what those deadlocks 
look
like (and the cited HH internal issue 163542 is not available for 
inspection).
It does lead to code erroneously being called with unlocked solar mutex, 
leading
to crashes like

Thread 1:
 0  in com::sun::star::uno::BaseReference::is at 
solver/unxlngx6/inc/com/sun/star/uno/Reference.h:103
 1  in sdr::contact::ControlHolder::is at 
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx:204
 2  in sdr::contact::ViewObjectContactOfUnoControl_Impl::hasControl at 
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx:642
 3  in sdr::contact::ViewObjectContactOfUnoControl::isPrimitiveVisible at 
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx:1815
 4  in sdr::contact::ViewObjectContact::getPrimitive2DSequenceHierarchy at 
svx/source/sdr/contact/viewobjectcontact.cxx:396
 5  in sdr::contact::ViewObjectContact::getPrimitive2DSequenceSubHierarchy 
at svx/source/sdr/contact/viewobjectcontact.cxx:428
 6  in 
sdr::contact::ViewObjectContactOfPageHierarchy::getPrimitive2DSequenceHierarchy 
at svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx:450
 7  in sdr::contact::ViewObjectContact::getPrimitive2DSequenceSubHierarchy 
at svx/source/sdr/contact/viewobjectcontact.cxx:428
 8  in 
sdr::contact::ViewObjectContactOfSdrPage::getPrimitive2DSequenceHierarchy at 
svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx:699
 9  in sdr::contact::ObjectContactOfPageView::DoProcessDisplay at 
svx/source/sdr/contact/objectcontactofpageview.cxx:248
 10 in sdr::contact::ObjectContactOfPageView::ProcessDisplay at 
svx/source/sdr/contact/objectcontactofpageview.cxx:132
 11 in SdrPageWindow::RedrawLayer at svx/source/svdraw/sdrpagewindow.cxx:391
 12 in SdrPageView::DrawLayer at svx/source/svdraw/svdpagv.cxx:398
 13 in SwViewImp::PaintLayer at sw/source/core/view/vdraw.cxx:148
 14 in SwRootFrm::Paint at sw/source/core/layout/paintfrm.cxx:2976
 15 in ViewShell::Paint at sw/source/core/view/viewsh.cxx:1678
 16 in SwCrsrShell::Paint at sw/source/core/crsr/crsrsh.cxx:1165
 17 in SwEditWin::Paint at sw/source/ui/docvw/edtwin2.cxx:535
 18 in Window::ImplCallPaint at vcl/source/window/window.cxx:2417
 19 in Window::ImplCallPaint at vcl/source/window/window.cxx:2441
 20 in Window::ImplCallPaint at vcl/source/window/window.cxx:2441
 21 in Window::ImplCallPaint at vcl/source/window/window.cxx:2441
 22 in Window::ImplCallPaint at vcl/source/window/window.cxx:2441
 23 in Window::ImplCallPaint at vcl/source/window/window.cxx:2441
 24 in Window::ImplCallPaint at vcl/source/window/window.cxx:2441
 25 in Window::ImplCallOverlapPaint at vcl/source/window/window.cxx:2477
 26 in Window::ImplHandlePaintHdl at vcl/source/window/window.cxx:2497
 27 in Window::LinkStubImplHandlePaintHdl at 
vcl/source/window/window.cxx:2491
 28 in Link::Call at solver/unxlngx6/inc/tools/link.hxx:140
 29 in Timer::Timeout at vcl/source/app/timer.cxx:256
 30 in Timer::ImplTimerCallbackProc at vcl/source/app/timer.cxx:144
 31 in SalTimer::CallCallback at vcl/inc/saltimer.hxx:66
 32 in SvpSalInstance::CheckTimeout at vcl/headless/svpinst.cxx:199
 33 in SvpSalInstance::Yield at vcl/headless/svpinst.cxx:310
 34 in ImplYield at vcl/source/app/svapp.cxx:455
 35 in Application::Reschedule at vcl/source/app/svapp.cxx:482
 36 in SolarMutexReleaser::~SolarMutexReleaser at 
solver/unxlngx6/inc/vcl/svapp.hxx:551
 37 in VCLXWindowImpl::OnProcessCallbacks at 
toolkit/source/awt/vclxwindow.cxx:320
 38 in VCLXWindowImpl::LinkStubOnProcessCallbacks at 
toolkit/source/awt/vclxwindow.cxx:291
 39 in Link::Call at solver/unxlngx6/inc/tools/link.hxx:140
 40 in ImplHandleUserEvent at vcl/source/window/winproc.cxx:1999
 41 in ImplWindowFrameProc at vcl/source/window/winproc.cxx:2571
 42 in SalFrame::CallCallback at vcl/inc/salframe.hxx:294
 43 in SvpSalInstance::Yield at vcl/headless/svpinst.cxx:299
 44 in ImplYield at vcl/source/app/svapp.cxx:455
 45 in Application::Yield at vcl/source/app/svapp.cxx:489
 46 in Application::Execute at vcl/source/app/svapp.cxx:432
 47 in desktop::Desktop::Main at desktop/source/app/app.cxx:1824
 48 in ImplSVMain at vcl/source/app/svmain.cxx:178
 49 in SVMain at vcl/source/app/svmain.cxx:215
 50 in soffice_main at 

[Libreoffice-commits] .: svtools/source

[Stephan Bergmann]

 svtools/source/control/calendar.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e770d5300054d56545bba3c16635a14e92fde807
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Jan 16 16:01:25 2012 +0100

Fix #ifdef SAL_LOG_INFO region.

diff --git a/svtools/source/control/calendar.cxx 
b/svtools/source/control/calendar.cxx
index 0cf3041..0b291e0 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -217,10 +217,10 @@ void Calendar::ImplInit( WinBits nWinStyle )
 {
 #ifdef SAL_LOG_INFO
 lang::Locale aLoc( Application::GetAppLocaleDataWrapper().getLocale() 
);
-#endif
 SAL_INFO( svtools, Calendar::ImplInit: No ``gregorian'' calendar 
available for locale ``
  aLoc.Language  -  aLoc.Country
  '' and other calendars aren't supported. Using en-US 
fallback. );
+#endif
 
 /* If we ever wanted to support other calendars than Gregorian a lot of
  * rewrite would be necessary to internally replace use of class Date
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: i18npool/source

[Eike Rathke]

 i18npool/source/localedata/data/cs_CZ.xml |   89 ++
 1 file changed, 78 insertions(+), 11 deletions(-)

New commits:
commit 2955fc0c3ef3c15b5fdad43969402503ed439336
Author: Da'angh Khagaroth khagar...@gmail.com
Date:   Mon Jan 16 17:13:52 2012 +0100

DateAcceptancePattern and PartitiveMonths for Czech language

diff --git a/i18npool/source/localedata/data/cs_CZ.xml 
b/i18npool/source/localedata/data/cs_CZ.xml
index 0c78160..5dd47e7 100644
--- a/i18npool/source/localedata/data/cs_CZ.xml
+++ b/i18npool/source/localedata/data/cs_CZ.xml
@@ -35,26 +35,31 @@
 MeasurementSystemMetric/MeasurementSystem
   /LC_CTYPE
   LC_FORMAT
+DateAcceptancePatternD.M./DateAcceptancePattern
+DateAcceptancePatternD. M./DateAcceptancePattern
+DateAcceptancePatternD. M. Y/DateAcceptancePattern
+DateAcceptancePatternD. M./DateAcceptancePattern
+DateAcceptancePatternD. M. Y/DateAcceptancePattern
 FormatElement msgid=DateFormatskey0 default=true type=short 
usage=DATE formatindex=18
-  FormatCodeD.M./FormatCode
+  FormatCodeD. M. /FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey1 default=true type=long 
usage=DATE formatindex=19
   FormatCodeDD.  /FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey2 default=true type=medium 
usage=DATE formatindex=20
-  FormatCodeD.M./FormatCode
+  FormatCodeDD.MM./FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey3 default=false type=medium 
usage=DATE formatindex=21
-  FormatCodeD.M./FormatCode
+  FormatCodeDD.MM./FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey4 default=false type=long 
usage=DATE formatindex=22
-  FormatCodeD. MMM YY/FormatCode
+  FormatCodeD. MMM. YY/FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey5 default=false type=long 
usage=DATE formatindex=23
-  FormatCodeD. MMM /FormatCode
+  FormatCodeD. MMM. /FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey6 default=false type=long 
usage=DATE formatindex=24
-  FormatCodeD. MMM /FormatCode
+  FormatCodeD. MMM. /FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey7 default=false type=long 
usage=DATE formatindex=25
   FormatCodeD.  /FormatCode
@@ -63,10 +68,10 @@
   FormatCodeD.  /FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey9 default=false type=long 
usage=DATE formatindex=27
-  FormatCodeNN, D. MMM YY/FormatCode
+  FormatCodeNN, D. MMM. YY/FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey10 default=false type=medium 
usage=DATE formatindex=28
-  FormatCodeNN, DD. MMM YY/FormatCode
+  FormatCodeNN, DD. MMM. YY/FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey11 default=false type=long 
usage=DATE formatindex=29
   FormatCodeNN, D.  /FormatCode
@@ -75,7 +80,7 @@
   FormatCodeD.  /FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey13 default=false type=short 
usage=DATE formatindex=31
-  FormatCodeDD-MM/FormatCode
+  FormatCodeMM-DD/FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey14 default=false type=medium 
usage=DATE formatindex=32
   FormatCodeYY-MM-DD/FormatCode
@@ -85,10 +90,10 @@
   DefaultNameISO 8601 (EN 28601)/DefaultName
 /FormatElement
 FormatElement msgid=DateFormatskey16 default=false type=medium 
usage=DATE formatindex=34
-  FormatCodeMM YY/FormatCode
+  FormatCodeMM. YY/FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey17 default=false type=medium 
usage=DATE formatindex=35
-  FormatCodeMMM DD/FormatCode
+  FormatCodeDD. MMM./FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey18 default=false type=medium 
usage=DATE formatindex=36
   FormatCode/FormatCode
@@ -286,6 +291,68 @@
   DefaultFullNameprosinec/DefaultFullName
 /Month
   /MonthsOfYear
+  PartitiveMonths
+Month
+  MonthIDjan/MonthID
+  DefaultAbbrvNameI/DefaultAbbrvName
+  DefaultFullNameledna/DefaultFullName
+/Month
+Month
+  MonthIDfeb/MonthID
+  DefaultAbbrvNameII/DefaultAbbrvName
+  DefaultFullNameúnora/DefaultFullName
+/Month
+Month
+  MonthIDmar/MonthID
+  DefaultAbbrvNameIII/DefaultAbbrvName
+  DefaultFullNamebřezna/DefaultFullName
+/Month
+Month
+  MonthIDapr/MonthID
+  DefaultAbbrvNameIV/DefaultAbbrvName
+  DefaultFullNamedubna/DefaultFullName
+/Month
+Month
+  MonthIDmay/MonthID
+  DefaultAbbrvNameV/DefaultAbbrvName
+  DefaultFullNamekvětna/DefaultFullName
+/Month
+Month
+  MonthIDjun/MonthID
+  DefaultAbbrvNameVI/DefaultAbbrvName
+  

[Libreoffice-commits] .: unusedcode.easy vcl/inc vcl/source

[Caolán McNamara]

 unusedcode.easy  |1 -
 vcl/inc/vcl/field.hxx|1 -
 vcl/source/control/field.cxx |   14 --
 3 files changed, 16 deletions(-)

New commits:
commit d2d730f65774564f27f3f5a0d3a1ee94db21c47f
Author: Mariusz Dykierek mariuszdykie...@gmail.com
Date:   Mon Jan 16 16:20:43 2012 +

Removed FormatterBase::SetFieldText

diff --git a/unusedcode.easy b/unusedcode.easy
index 26f593d..87e2618 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -94,7 +94,6 @@ FontSelectPattern::FontSelectPattern(ImplFontData const, 
Size const, float, in
 FontSizeBox::SetUserValue(long, FieldUnit)
 FontStyleBox::FontStyleBox(Window*, long)
 FormattedField::SetValidateText(String const, String const*)
-FormatterBase::SetFieldText(String const, unsigned char)
 GraphCtrl::GraphCtrl(Window*, long)
 GtkSalFrame::popIgnoreDamage()
 GtkSalFrame::pushIgnoreDamage()
diff --git a/vcl/inc/vcl/field.hxx b/vcl/inc/vcl/field.hxx
index 5f5e8d6..311346e 100644
--- a/vcl/inc/vcl/field.hxx
+++ b/vcl/inc/vcl/field.hxx
@@ -62,7 +62,6 @@ protected:
 SAL_DLLPRIVATE void ImplSetText( const XubString rText, Selection* 
pNewSel = NULL );
 SAL_DLLPRIVATE sal_Bool ImplGetEmptyFieldValue() const  { return 
mbEmptyFieldValue; }
 
-voidSetFieldText( const XubString rText, sal_Bool 
bKeepSelection );
 voidSetEmptyFieldValueData( sal_Bool bValue ) { 
mbEmptyFieldValue = bValue; }
 
 SAL_DLLPRIVATE LocaleDataWrapper ImplGetLocaleDataWrapper() const;
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 1538287..51c4ee2 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -387,20 +387,6 @@ const AllSettings FormatterBase::GetFieldSettings() const
 
 // ---
 
-void FormatterBase::SetFieldText( const XubString rText, sal_Bool 
bKeepSelection )
-{
-if ( mpField )
-{
-Selection aNewSelection( 0x, 0x );
-if ( bKeepSelection )
-aNewSelection = mpField-GetSelection();
-
-ImplSetText( rText, aNewSelection );
-}
-}
-
-// ---
-
 void FormatterBase::ImplSetText( const XubString rText, Selection* 
pNewSelection )
 {
 if ( mpField )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - i18npool/source

[Eike Rathke]

 i18npool/source/localedata/data/cs_CZ.xml |   62 ++
 1 file changed, 62 insertions(+)

New commits:
commit 36b13ef610ea01e70a32bbb16bdd903b80da3217
Author: Da'angh Khagaroth khagar...@gmail.com
Date:   Mon Jan 16 17:20:34 2012 +0100

PartitiveMonths for Czech language

diff --git a/i18npool/source/localedata/data/cs_CZ.xml 
b/i18npool/source/localedata/data/cs_CZ.xml
index 977b68f..ac17146 100644
--- a/i18npool/source/localedata/data/cs_CZ.xml
+++ b/i18npool/source/localedata/data/cs_CZ.xml
@@ -331,6 +331,68 @@
 DefaultFullNameprosinec/DefaultFullName
 /Month
 /MonthsOfYear
+  PartitiveMonths
+Month
+  MonthIDjan/MonthID
+  DefaultAbbrvNameI/DefaultAbbrvName
+  DefaultFullNameledna/DefaultFullName
+/Month
+Month
+  MonthIDfeb/MonthID
+  DefaultAbbrvNameII/DefaultAbbrvName
+  DefaultFullNameúnora/DefaultFullName
+/Month
+Month
+  MonthIDmar/MonthID
+  DefaultAbbrvNameIII/DefaultAbbrvName
+  DefaultFullNamebřezna/DefaultFullName
+/Month
+Month
+  MonthIDapr/MonthID
+  DefaultAbbrvNameIV/DefaultAbbrvName
+  DefaultFullNamedubna/DefaultFullName
+/Month
+Month
+  MonthIDmay/MonthID
+  DefaultAbbrvNameV/DefaultAbbrvName
+  DefaultFullNamekvětna/DefaultFullName
+/Month
+Month
+  MonthIDjun/MonthID
+  DefaultAbbrvNameVI/DefaultAbbrvName
+  DefaultFullNamečervna/DefaultFullName
+/Month
+Month
+  MonthIDjul/MonthID
+  DefaultAbbrvNameVII/DefaultAbbrvName
+  DefaultFullNamečervence/DefaultFullName
+/Month
+Month
+  MonthIDaug/MonthID
+  DefaultAbbrvNameVIII/DefaultAbbrvName
+  DefaultFullNamesrpna/DefaultFullName
+/Month
+Month
+  MonthIDsep/MonthID
+  DefaultAbbrvNameIX/DefaultAbbrvName
+  DefaultFullNamezáří/DefaultFullName
+/Month
+Month
+  MonthIDoct/MonthID
+  DefaultAbbrvNameX/DefaultAbbrvName
+  DefaultFullNameříjna/DefaultFullName
+/Month
+Month
+  MonthIDnov/MonthID
+  DefaultAbbrvNameXI/DefaultAbbrvName
+  DefaultFullNamelistopadu/DefaultFullName
+/Month
+Month
+  MonthIDdec/MonthID
+  DefaultAbbrvNameXII/DefaultAbbrvName
+  DefaultFullNameprosince/DefaultFullName
+/Month
+  /PartitiveMonths
 Eras
 Era
 EraIDbc/EraID
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 6 commits - basic/inc basic/source

[August Sodora]

 basic/inc/basic/sbdef.hxx |   33 +
 basic/inc/basic/sbmod.hxx |1 -
 basic/inc/basic/sbstar.hxx|6 --
 basic/source/classes/sbintern.cxx |1 -
 basic/source/inc/sbintern.hxx |1 -
 basic/source/runtime/methods.cxx  |5 ++---
 6 files changed, 3 insertions(+), 44 deletions(-)

New commits:
commit 9a2859df2d908774399b4041b47f2c390d030b31
Author: August Sodora aug...@gmail.com
Date:   Mon Jan 16 00:51:20 2012 -0500

Remove invalid friend declaration

diff --git a/basic/inc/basic/sbmod.hxx b/basic/inc/basic/sbmod.hxx
index 443ecde..24700e9 100644
--- a/basic/inc/basic/sbmod.hxx
+++ b/basic/inc/basic/sbmod.hxx
@@ -55,7 +55,6 @@ class SbModuleImpl;
 
 class BASIC_DLLPUBLIC SbModule : public SbxObject, private ::boost::noncopyable
 {
-friend classTestToolObj;// allows module initialisation at runtime
 friend classSbiCodeGen;
 friend classSbMethod;
 friend classSbiRuntime;
commit ad5bc7a1ecbe41ae49860c7223fd9f99cb3c4697
Author: August Sodora aug...@gmail.com
Date:   Sun Jan 15 23:55:04 2012 -0500

String-OUString

diff --git a/basic/inc/basic/sbdef.hxx b/basic/inc/basic/sbdef.hxx
index fefdc37..d3a8615 100644
--- a/basic/inc/basic/sbdef.hxx
+++ b/basic/inc/basic/sbdef.hxx
@@ -30,13 +30,12 @@
 #define _SB_SBDEF_HXX
 
 #include basic/sbxdef.hxx
-#include svl/svarray.hxx
 #include rtl/ustring.hxx
 #include basicdllapi.h
 
 // Returns type name for Basic type, array flag is ignored
 // implementation: basic/source/runtime/methods.cxx
-BASIC_DLLPUBLIC String getBasicTypeName( SbxDataType eType );
+BASIC_DLLPUBLIC ::rtl::OUString getBasicTypeName( SbxDataType eType );
 
 // Returns type name for Basic objects, especially
 // important for SbUnoObj instances
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index e6aef79..e457b2e 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -3414,7 +3414,7 @@ RTLFUNC(VarType)
 }
 
 // Exported function
-String getBasicTypeName( SbxDataType eType )
+rtl::OUString getBasicTypeName( SbxDataType eType )
 {
 static const char* pTypeNames[] =
 {
@@ -3462,8 +3462,7 @@ String getBasicTypeName( SbxDataType eType )
 sal_uInt16 nTypeNameCount = sizeof( pTypeNames ) / sizeof( char* );
 if ( nPos  0 || nPos = nTypeNameCount )
 nPos = nTypeNameCount - 1;
-String aRetStr = String::CreateFromAscii( pTypeNames[nPos] );
-return aRetStr;
+return rtl::OUString::createFromAscii(pTypeNames[nPos]);
 }
 
 String getObjectTypeName( SbxVariable* pVar )
commit 0ced88ad440995e1f84ba0712df1092bfc225c84
Author: August Sodora aug...@gmail.com
Date:   Sun Jan 15 23:47:54 2012 -0500

Remove unused enum SbLanguageMode

diff --git a/basic/inc/basic/sbdef.hxx b/basic/inc/basic/sbdef.hxx
index 82dfd65..fefdc37 100644
--- a/basic/inc/basic/sbdef.hxx
+++ b/basic/inc/basic/sbdef.hxx
@@ -34,15 +34,6 @@
 #include rtl/ustring.hxx
 #include basicdllapi.h
 
-// Active language
-enum SbLanguageMode
-{
-SB_LANG_GLOBAL,  // As in SbiGlobals struct
-SB_LANG_BASIC,   // StarBasic (Default)
-SB_LANG_VBSCRIPT,// Visual-Basic-Script
-SB_LANG_JAVASCRIPT   // JavaScript
-};
-
 // Returns type name for Basic type, array flag is ignored
 // implementation: basic/source/runtime/methods.cxx
 BASIC_DLLPUBLIC String getBasicTypeName( SbxDataType eType );
diff --git a/basic/inc/basic/sbstar.hxx b/basic/inc/basic/sbstar.hxx
index f71bf51..dc6622e 100644
--- a/basic/inc/basic/sbstar.hxx
+++ b/basic/inc/basic/sbstar.hxx
@@ -74,7 +74,6 @@ class BASIC_DLLPUBLIC StarBASIC : public SbxObject
 sal_BoolbDocBasic;
 sal_BoolbVBAEnabled;
 BasicLibInfo*   pLibInfo;   // Info block for basic manager
-SbLanguageMode  eLanguageMode;  // LanguageMode of the basic object
 sal_BoolbQuit;
 
 SbxObjectRef pVBAGlobals;
@@ -161,11 +160,6 @@ public:
 static sal_Bool IsCompilerError();
 static sal_uInt16   GetVBErrorCode( SbError nError );
 static SbError  GetSfxFromVBError( sal_uInt16 nError );
-// Local settings
-void SetLanguageMode( SbLanguageMode eLangMode )
-{ eLanguageMode = eLangMode; }
-
-// Specific for break handler
 sal_BoolIsBreak() const { return bBreak; }
 
 static Link GetGlobalErrorHdl();
diff --git a/basic/source/classes/sbintern.cxx 
b/basic/source/classes/sbintern.cxx
index 9160c11..1993aa6 100644
--- a/basic/source/classes/sbintern.cxx
+++ b/basic/source/classes/sbintern.cxx
@@ -63,7 +63,6 @@ SbiGlobals::SbiGlobals()
 bCompiler = sal_False;
 bGlobalInitErr = sal_False;
 bRunInit = sal_False;
-eLanguageMode = SB_LANG_BASIC;
 pErrStack = NULL;
 pTransliterationWrapper = NULL;
 bBlockCompilerError = sal_False;
diff --git a/basic/source/inc/sbintern.hxx b/basic/source/inc/sbintern.hxx
index 6d6143b..ac6b883 100644
--- 

[Libreoffice-commits] .: sc/source

[Caolán McNamara]

 sc/source/core/tool/interpr4.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ef0ee083e668be2b41e86196417893f84359aee8
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Jan 16 17:00:05 2012 +

fix build error

diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index b329ccb..cda83d3 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -1456,7 +1456,7 @@ void ScInterpreter::PopExternalSingleRef(
 return;
 
 ScExternalRefManager* pRefMgr = pDok-GetExternalRefManager();
-const OUString* pFile = pRefMgr-getExternalFileName(rFileId);
+const rtl::OUString* pFile = pRefMgr-getExternalFileName(rFileId);
 if (!pFile)
 {
 SetError(errNoName);
@@ -1548,7 +1548,7 @@ void ScInterpreter::GetExternalDoubleRef(
 sal_uInt16 nFileId, const String rTabName, const ScComplexRefData rData, 
ScExternalRefCache::TokenArrayRef rArray)
 {
 ScExternalRefManager* pRefMgr = pDok-GetExternalRefManager();
-const OUString* pFile = pRefMgr-getExternalFileName(nFileId);
+const rtl::OUString* pFile = pRefMgr-getExternalFileName(nFileId);
 if (!pFile)
 {
 SetError(errNoName);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: xmloff/inc xmloff/source

[August Sodora]

 xmloff/inc/xmloff/txtparae.hxx  |3 --
 xmloff/source/text/txtparae.cxx |   56 +++-
 2 files changed, 22 insertions(+), 37 deletions(-)

New commits:
commit 2070d9a298f40d3a866920106357843994e90c85
Author: August Sodora aug...@gmail.com
Date:   Mon Jan 16 12:36:13 2012 -0500

SV_DECL_PTRARR_DEL-std::vector

diff --git a/xmloff/inc/xmloff/txtparae.hxx b/xmloff/inc/xmloff/txtparae.hxx
index 0ed0583..4fb9ad6 100644
--- a/xmloff/inc/xmloff/txtparae.hxx
+++ b/xmloff/inc/xmloff/txtparae.hxx
@@ -49,7 +49,6 @@ class XMLTextListsHelper;
 class SvXMLExport;
 class SvXMLAutoStylePoolP;
 class XMLTextFieldExport;
-class OUStrings_Impl;
 class XMLTextNumRuleInfo;
 class XMLTextListAutoStylePool;
 class XMLSectionExport;
@@ -89,7 +88,7 @@ class XMLOFF_DLLPUBLIC XMLTextParagraphExport : public 
XMLStyleExport
 
 const ::std::auto_ptr ::xmloff::BoundFrameSets  pBoundFrameSets;
 XMLTextFieldExport  *pFieldExport;
-OUStrings_Impl  *pListElements;
+std::vectorrtl::OUString  *pListElements;
 XMLTextListAutoStylePool*pListAutoPool;
 XMLSectionExport*pSectionExport;
 XMLIndexMarkExport  *pIndexMarkExport;
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 7df0eb5..e32203a 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -273,10 +273,6 @@ namespace xmloff
 };
 }
 
-typedef OUString *OUStringPtr;
-SV_DECL_PTRARR_DEL( OUStrings_Impl, OUStringPtr, 20, 10 )
-SV_IMPL_PTRARR( OUStrings_Impl, OUStringPtr )
-
 #ifdef DBG_UTIL
 static int txtparae_bContainsIllegalCharacters = sal_False;
 #endif
@@ -860,17 +856,14 @@ void XMLTextParagraphExport::exportListChange(
 
 if ( nListLevelsToBeClosed  0 
  pListElements 
- pListElements-Count() = ( 2 * nListLevelsToBeClosed ) )
+ pListElements-size() = ( 2 * nListLevelsToBeClosed ) )
 {
 do {
-for( sal_uInt16 j = 0; j  2; ++j )
+for(size_t j = 0; j  2; ++j)
 {
-OUString *pElem = 
(*pListElements)[pListElements-Count()-1];
-pListElements-Remove( pListElements-Count()-1 );
-
-GetExport().EndElement( *pElem, sal_True );
-
-delete pElem;
+rtl::OUString aElem(pListElements-back());
+pListElements-pop_back();
+GetExport().EndElement(aElem, sal_True);
 }
 
 // remove closed list from list stack
@@ -1021,16 +1014,15 @@ void XMLTextParagraphExport::exportListChange(
 
 enum XMLTokenEnum eLName = XML_LIST;
 
-OUString *pElem = new OUString(
-GetExport().GetNamespaceMap().GetQNameByKey(
+rtl::OUString 
aElem(GetExport().GetNamespaceMap().GetQNameByKey(
 XML_NAMESPACE_TEXT,
 GetXMLToken(eLName) ) );
 GetExport().IgnorableWhitespace();
-GetExport().StartElement( *pElem, sal_False );
+GetExport().StartElement(aElem, sal_False);
 
-if( !pListElements )
-pListElements = new OUStrings_Impl;
-pListElements-Insert( pElem, pListElements-Count() );
+if(!pListElements)
+pListElements = new std::vectorrtl::OUString;
+pListElements-push_back(aElem);
 
 mpTextListsHelper-PushListOnStack( sListId,
 sListStyleName );
@@ -1064,13 +1056,12 @@ void XMLTextParagraphExport::exportListChange(
 eLName = ( rNextInfo.IsNumbered() || nListLevelsToBeOpened  1 
)
  ? XML_LIST_ITEM
  : XML_LIST_HEADER;
-pElem = new OUString(  
GetExport().GetNamespaceMap().GetQNameByKey(
+aElem = rtl::OUString( 
GetExport().GetNamespaceMap().GetQNameByKey(
 XML_NAMESPACE_TEXT,
 GetXMLToken(eLName) ) );
 GetExport().IgnorableWhitespace();
-GetExport().StartElement( *pElem, sal_False );
-
-pListElements-Insert( pElem, pListElements-Count() );
+GetExport().StartElement(aElem, sal_False);
+pListElements-push_back(aElem);
 
 // export of text:number element for last opened 
text:list-item, if requested
 if ( GetExport().exportTextNumberElement() 
@@ -1097,24 +1088,20 @@ void XMLTextParagraphExport::exportListChange(
  rPrevInfo.GetLevel() = rNextInfo.GetLevel() )
 {
 // close previous list-item
-DBG_ASSERT( pListElements  pListElements-Count() = 2,
+DBG_ASSERT( pListElements  

[Libreoffice-commits] .: sw/source

[Lubos Lunak]

 sw/source/filter/ww8/ww8par5.cxx |   31 +--
 1 file changed, 29 insertions(+), 2 deletions(-)

New commits:
commit 09a25659775c4d39eb40507e7cbd9472570834d3
Author: Kenneth Aafløy kenneth_li...@aafloy.net
Date:   Wed Jan 11 15:22:27 2012 +0100

Add import of docvariable fields from word documents

Hi,

Attached is a patch that adds support for importing docvariable fields
from microsoft word documents. The variables themselves are already
converted correctly, so this patch only ties the field to the existing
custom document information.

Please consider this patch for inclusion.

I declare that this and my further patches are under LGPLv3+ / MPL license.

With Regards,
Kenneth Aafløy

diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index e5cf9c8..f27ef6b 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -965,7 +965,7 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
 0,
 0,
 0,
-0,
+SwWW8ImplReader::Read_F_DocInfo,   // 64 - DOCVARIABLE
 0,
 0,
 SwWW8ImplReader::Read_F_IncludePicture,// 67
@@ -1759,6 +1759,9 @@ eF_ResT SwWW8ImplReader::Read_F_DocInfo( WW8FieldDesc* 
pF, String rStr )
 nReg = DI_SUB_TIME;
 bDateTime = true;
 break;
+case 64: // DOCVARIABLE
+nSub = DI_CUSTOM;
+break;
 }
 
 sal_uInt32 nFormat = 0;
@@ -1784,8 +1787,32 @@ eF_ResT SwWW8ImplReader::Read_F_DocInfo( WW8FieldDesc* 
pF, String rStr )
 }
 }
 
+String aData;
+// Extract DOCVARIABLE varname
+if ( 64 == pF-nId )
+{
+_ReadFieldParams aReadParam( rStr );
+long nRet;
+while( -1 != ( nRet = aReadParam.SkipToNextToken() ))
+{
+switch( nRet )
+{
+case -2:
+if( !aData.Len() )
+aData = aReadParam.GetResult();
+break;
+case '*':
+//Skip over MERGEFORMAT
+aReadParam.SkipToNextToken();
+break;
+}
+}
+
+aData = comphelper::string::remove(aData, '');
+}
+
 SwDocInfoField aFld( (SwDocInfoFieldType*)
-rDoc.GetSysFldType( RES_DOCINFOFLD ), nSub|nReg, String(), nFormat );
+rDoc.GetSysFldType( RES_DOCINFOFLD ), nSub|nReg, aData, nFormat );
 if (bDateTime)
 ForceFieldLanguage(aFld, nLang);
 rDoc.InsertPoolItem(*pPaM, SwFmtFld(aFld), 0);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: desktop/Module_desktop.mk desktop/Package_branding.mk desktop/Zip_brand_dev.mk desktop/Zip_brand.mk scp2/source

[Thorsten Behrens]

 desktop/Module_desktop.mk|2 -
 desktop/Package_branding.mk  |   32 ---
 desktop/Zip_brand.mk |   45 +--
 desktop/Zip_brand_dev.mk |   45 +++
 scp2/source/ooo/common_brand.scp |   12 +-
 5 files changed, 82 insertions(+), 54 deletions(-)

New commits:
commit a3849747a393a16a0d11ef91236cc9a910e73f18
Author: Thorsten Behrens tbehr...@suse.com
Date:   Mon Jan 16 18:44:38 2012 +0100

Fix configurable branding.

Bin the submakefile, use direct Zip cp calls. This also fixes
the non-working deps towards default_images.

diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 559097e..3d0045c 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -47,11 +47,9 @@ $(eval $(call gb_Module_add_targets,desktop,\
 Library_offacc \
 Library_sofficeapp \
 Library_spl \
-Package_branding \
 Package_intro \
 Zip_brand \
 Zip_brand_dev \
-Zip_shell \
 ))
 
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
diff --git a/desktop/Package_branding.mk b/desktop/Package_branding.mk
deleted file mode 100644
index bd2f36f..000
--- a/desktop/Package_branding.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- 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) 2011 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_Package_Package,desktop_branding,$(WORKDIR)/CustomTarget/desktop/branding))
-
-$(eval $(call gb_Package_add_customtarget,desktop_branding,desktop/branding))
-
-# vim: set ts=4 sw=4 et:
diff --git a/desktop/Zip_brand.mk b/desktop/Zip_brand.mk
index 03ba5ec..05a2723 100644
--- a/desktop/Zip_brand.mk
+++ b/desktop/Zip_brand.mk
@@ -25,15 +25,48 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_Zip_Zip,brand/intro,$(WORKDIR)/CustomTarget/desktop/branding))
+$(eval $(call gb_Zip_Zip,brand/intro,$(WORKDIR)/Zip/brand_intro))
 
-$(eval $(call gb_Zip_add_files,brand/intro,\
-about.png \
-intro.png \
+$(eval $(call gb_Zip_add_file,brand/intro,about.png,\
+   $(if $(ABOUT_BITMAP),\
+   $(ABOUT_BITMAP),\
+   $(SRCDIR)/icon-themes/galaxy/brand/about.png)\
 ))
 
-$(eval $(call gb_Zip_add_dependencies,brand/intro,\
-$(call gb_Package_get_target,desktop_branding) \
+$(eval $(call gb_Zip_add_file,brand/intro,intro.png,\
+   $(if $(INTRO_BITMAP),\
+   $(INTRO_BITMAP),\
+   $(SRCDIR)/icon-themes/galaxy/brand/intro.png)\
+))
+
+$(eval $(call gb_Zip_add_file,brand/intro,shell/backing_left.png,\
+   $(if $(STARTCENTER_LEFT_BITMAP),\
+   $(STARTCENTER_LEFT_BITMAP),\
+   $(SRCDIR)/icon-themes/galaxy/brand/shell/backing_left.png)\
+))
+
+$(eval $(call gb_Zip_add_file,brand/intro,shell/backing_right.png,\
+   $(if $(STARTCENTER_RIGHT_BITMAP),\
+   $(STARTCENTER_RIGHT_BITMAP),\
+   $(SRCDIR)/icon-themes/galaxy/brand/shell/backing_right.png)\
+))
+
+$(eval $(call gb_Zip_add_file,brand/intro,shell/backing_space.png,\
+   $(if $(STARTCENTER_SPACE_BITMAP),\
+   $(STARTCENTER_SPACE_BITMAP),\
+   $(SRCDIR)/icon-themes/galaxy/brand/shell/backing_space.png)\
+))
+
+$(eval $(call gb_Zip_add_file,brand/intro,shell/backing_rtl_left.png,\
+   $(if $(STARTCENTER_RTL_LEFT_BITMAP),\
+   $(STARTCENTER_RTL_LEFT_BITMAP),\
+   $(SRCDIR)/icon-themes/galaxy/brand/shell/backing_rtl_left.png)\
+))
+
+$(eval $(call gb_Zip_add_file,brand/intro,shell/backing_rtl_right.png,\
+   $(if $(STARTCENTER_RTL_RIGHT_BITMAP),\
+   $(STARTCENTER_RTL_RIGHT_BITMAP),\
+   $(SRCDIR)/icon-themes/galaxy/brand/shell/backing_rtl_right.png)\
 ))
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/Zip_brand_dev.mk b/desktop/Zip_brand_dev.mk
index 72f2261..b554a69 100644
--- a/desktop/Zip_brand_dev.mk

[Libreoffice-commits] .: ucb/source

[Julien Nabet]

 ucb/source/ucp/webdav/LockEntrySequence.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9dfa70c22d4f3ad480ffb98c0c8e1ea40f03dc18
Author: Julien Nabet serval2...@yahoo.fr
Date:   Mon Jan 16 20:45:44 2012 +0100

Fix Same expression on both sides of '||'

diff --git a/ucb/source/ucp/webdav/LockEntrySequence.cxx 
b/ucb/source/ucp/webdav/LockEntrySequence.cxx
index 49e5547..075af01 100644
--- a/ucb/source/ucp/webdav/LockEntrySequence.cxx
+++ b/ucb/source/ucp/webdav/LockEntrySequence.cxx
@@ -171,7 +171,7 @@ extern C int LockEntrySequence_endelement_callback(
 break;
 
 case STATE_LOCKENTRY:
-if ( !pCtx-hasType || !pCtx-hasType )
+if ( !pCtx-hasType || !pCtx-hasScope )
 return 1; // abort
 break;
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: xmloff/source

[Stephan Bergmann]

 xmloff/source/text/txtparae.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 69d91300547f6ed45a9a499ffae71c2c0f91c441
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Jan 16 21:42:09 2012 +0100

WaE signed/unsigned comparison.

diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index e32203a..96316d1 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -856,7 +856,7 @@ void XMLTextParagraphExport::exportListChange(
 
 if ( nListLevelsToBeClosed  0 
  pListElements 
- pListElements-size() = ( 2 * nListLevelsToBeClosed ) )
+ pListElements-size() = ( 2 * sal::static_int_cast sal_uInt16 
(nListLevelsToBeClosed) ) )
 {
 do {
 for(size_t j = 0; j  2; ++j)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: testtools/source toolkit/source tools/bootstrp tools/inc tools/qa tools/source

[Olivier Hallot]

 testtools/source/bridgetest/bridgetest.cxx|4 +-
 toolkit/source/awt/vclxtoolkit.cxx|4 +-
 toolkit/source/awt/vclxwindow.cxx |2 -
 toolkit/source/awt/vclxwindows.cxx|8 ++---
 toolkit/source/controls/controlmodelcontainerbase.cxx |8 ++---
 toolkit/source/controls/dialogcontrol.cxx |   12 +++
 toolkit/source/controls/geometrycontrolmodel.cxx  |2 -
 toolkit/source/controls/unocontrol.cxx|2 -
 toolkit/source/controls/unocontrolmodel.cxx   |8 ++---
 toolkit/source/controls/unocontrols.cxx   |2 -
 toolkit/source/helper/formpdfexport.cxx   |2 -
 toolkit/source/helper/tkresmgr.cxx|2 -
 toolkit/source/helper/vclunohelper.cxx|4 +-
 tools/bootstrp/cppdep.cxx |2 -
 tools/bootstrp/rscdep.cxx |2 -
 tools/inc/tools/diagnose_ex.h |2 -
 tools/qa/cppunit/test_stream.cxx  |2 -
 tools/source/fsys/dirent.cxx  |   26 
 tools/source/fsys/tempfile.cxx|2 -
 tools/source/fsys/urlobj.cxx  |   18 +--
 tools/source/generic/svlibrary.cxx|2 -
 tools/source/inet/inetmime.cxx|2 -
 tools/source/misc/appendunixshellword.cxx |2 -
 tools/source/misc/getprocessworkingdir.cxx|2 -
 tools/source/rc/resmgr.cxx|   28 +-
 25 files changed, 75 insertions(+), 75 deletions(-)

New commits:
commit 81e50fb2e378120d05f7ffdee216ce6e248e189b
Author: Olivier Hallot olivier.hal...@alta.org.br
Date:   Mon Jan 16 15:46:57 2012 -0200

Fix for fdo43460 Part XXXIX getLength() to isEmpty()

Part XXXIX
Modules
testtools, toolkit, tools

diff --git a/testtools/source/bridgetest/bridgetest.cxx 
b/testtools/source/bridgetest/bridgetest.cxx
index 27af77b..46435fb 100644
--- a/testtools/source/bridgetest/bridgetest.cxx
+++ b/testtools/source/bridgetest/bridgetest.cxx
@@ -100,7 +100,7 @@ static bool check( bool b , char const * message )
 namespace {
 
 bool checkEmpty(rtl::OUString const  string, char const * message) {
-bool ok = string.getLength() == 0;
+bool ok = string.isEmpty();
 if (!ok) {
 fprintf(
 stderr, %s failed: %s\n, message,
@@ -593,7 +593,7 @@ static sal_Bool performTest(
 bRet = check(
 xLBT-getNullPolyLong().member == 0, getNullPolyLong);
 bRet = check(
-xLBT-getNullPolyString().member.getLength() == 0,
+xLBT-getNullPolyString().member.isEmpty(),
 getNullPolyString);
 bRet = check(
 xLBT-getNullPolyType().member == Type(),
diff --git a/toolkit/source/awt/vclxtoolkit.cxx 
b/toolkit/source/awt/vclxtoolkit.cxx
index b9d94be..3a8e2c6 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -366,7 +366,7 @@ sal_uInt16 ImplGetComponentType( const String rServiceName 
)
 
 ComponentInfo aSearch;
 rtl::OString aServiceName(rtl::OUStringToOString(rServiceName, 
osl_getThreadTextEncoding()).toAsciiLowerCase());
-if ( aServiceName.getLength() )
+if ( !aServiceName.isEmpty() )
 aSearch.pName = aServiceName.getStr();
 else
 aSearch.pName = window;
@@ -1353,7 +1353,7 @@ css::uno::Reference css::awt::XWindowPeer  
VCLXToolkit::ImplCreateWindow(
 
 ::com::sun::star::uno::Reference 
::com::sun::star::datatransfer::clipboard::XClipboard  SAL_CALL 
VCLXToolkit::getClipboard( const ::rtl::OUString clipboardName ) 
throw(::com::sun::star::uno::RuntimeException)
 {
-if( clipboardName.getLength() == 0 )
+if( clipboardName.isEmpty() )
 {
 if( !mxClipboard.is() )
 {
diff --git a/toolkit/source/awt/vclxwindow.cxx 
b/toolkit/source/awt/vclxwindow.cxx
index 76eab5b..7f2af75 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -1545,7 +1545,7 @@ void VCLXWindow::setProperty( const ::rtl::OUString 
PropertyName, const ::com::
 case WINDOW_CANCELBUTTON:
 case WINDOW_HELPBUTTON:
 // Standard Button: overwrite only if not empty.
-if (aText.getLength())
+if (!aText.isEmpty())
 pWindow-SetText( aText );
 break;
 
diff --git a/toolkit/source/awt/vclxwindows.cxx 
b/toolkit/source/awt/vclxwindows.cxx
index 2669f0f..f85bc3c 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -2067,7 +2067,7 @@ namespace
 {
  Image lcl_getImageFromURL( const ::rtl::OUString i_rImageURL )
  {
- if ( 

[Libreoffice-commits] .: tools/source

[Olivier Hallot]

 tools/source/rc/resmgr.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit de8c830947a756b6d8ab2d7ef33934c9ba28036a
Author: Olivier Hallot olivier.hal...@alta.org.br
Date:   Mon Jan 16 19:10:45 2012 -0200

fix mistake in merging tools/source/rc/resmgr.cxx

fix mistake in merging tools/source/rc/resmgr.cxx

diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index 4652f24..8d83533 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -203,7 +203,7 @@ void ResMgrContainer::init()
 nIndex = 0;
 while( nIndex = 0 )
 {
-OUString aPathElement( aEnvPath.getToken( 0, 
SEARCH_PATH_DELIMITER, nIndex ) );
+OUString aPathElement( aEnvPath.getToken( 0, SAL_PATHSEPARATOR, 
nIndex ) );
 if( !aPathElement.isEmpty() )
 {
 OUString aFileURL;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: postprocess/packcomponents

[Michael Meeks]

 postprocess/packcomponents/makefile.mk |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 16d14899807cc46a5c22c3848eec939359d5fbd6
Author: Michael Meeks michael.me...@suse.com
Date:   Mon Jan 16 21:16:06 2012 +

android: LuceneHelpWrapper not built here.

diff --git a/postprocess/packcomponents/makefile.mk 
b/postprocess/packcomponents/makefile.mk
index 26549ff..94923a3 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -242,8 +242,11 @@ my_components += component/framework/util/lomenubar
 .END
 
 .IF $(SOLAR_JAVA) == TRUE
+.IF $(BUILD_TYPE) != $(BUILD_TYPE:s/DESKTOP//)
+my_components += \
+LuceneHelpWrapper
+.ENDIF
 my_components += \
-LuceneHelpWrapper \
 component/xmerge/source/bridge/XMergeBridge \
 component/filter/source/xsltfilter/XSLTFilter.jar \
 component/filter/source/xsltvalidate/XSLTValidate \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - configure.in

[Tor Lillqvist]

 configure.in |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit fe24578f5aae2fee7576bcfbf5046cd83becc16e
Author: Tor Lillqvist t...@iki.fi
Date:   Mon Jan 16 23:54:43 2012 +0200

Fix typo

diff --git a/configure.in b/configure.in
index 90b93fa..20411f3 100644
--- a/configure.in
+++ b/configure.in
@@ -2966,7 +2966,7 @@ if test $cross_compiling = yes; then
 done
 )
 test -f CONF-FOR-BUILD/build-config || AC_MSG_ERROR([Running configure 
script for BUILD system failed, see CONF-FOR-BUILD/config.log])
-test -f config_build.mk || AC_MSG_ERROR([A file called Env.Build.sh was 
supposed to have been copied here, but it isn't found])
+test -f config_build.mk || AC_MSG_ERROR([A file called config_build.mk was 
supposed to have been copied here, but it isn't found])
 test -f Env.Build.sh || AC_MSG_ERROR([A file called Env.Build.sh was 
supposed to have been copied here, but it isn't found])
 perl -pi -e 's,/CONF-FOR-BUILD,,g' Env.Build.sh
 perl -pi -e 's,/CONF-FOR-BUILD,,g' config_build.mk
commit 38a09a9e3ac7c550608ed96b560a0277d9021092
Author: Tor Lillqvist t...@iki.fi
Date:   Mon Jan 16 23:50:58 2012 +0200

Env.Build.sh should source config_build.mk

diff --git a/configure.in b/configure.in
index 488c6b7..90b93fa 100644
--- a/configure.in
+++ b/configure.in
@@ -2941,7 +2941,7 @@ if test $cross_compiling = yes; then
 test -f ./Env.Host.sh 2/dev/null || exit
 test -f ./config_host.mk 2/dev/null || exit
 cp config_host.mk ../config_build.mk
-cp Env.Host.sh ../Env.Build.sh
+sed -e 's/config_host.mk/config_build.mk/' Env.Host.sh ../Env.Build.sh
 cp config.log ../config.Build.log
 . ./config_host.mk
 . ./Env.Host.sh
commit 322085e0ea9d8323ced8aeb26d81e140e35af3d5
Author: Tor Lillqvist t...@iki.fi
Date:   Mon Jan 16 23:45:35 2012 +0200

There is no desktop/scripts/soffice.sh.in any more

diff --git a/configure.in b/configure.in
index 1fccd1e..488c6b7 100644
--- a/configure.in
+++ b/configure.in
@@ -2915,7 +2915,6 @@ if test $cross_compiling = yes; then
 set_soenv.in \
 solenv/inc/langlist.mk \
 solenv/inc/postset.mk \
-desktop/scripts/soffice.sh.in \
 | (cd CONF-FOR-BUILD  tar xf -)
 (
 unset COM GUI GUIBASE OS CPU CPUNAME
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - sax/inc sax/source unusedcode.easy vcl/generic

[Caolán McNamara]

 sax/inc/sax/fshelper.hxx  |5 ---
 sax/source/tools/fshelper.cxx |   48 --
 unusedcode.easy   |4 --
 vcl/generic/fontmanager/fontsubst.cxx |2 -
 4 files changed, 1 insertion(+), 58 deletions(-)

New commits:
commit d3253a0efdf0405790062f91b6dc164b1f2d
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Jan 16 20:58:00 2012 +

remove unimplemented methods from headers

diff --git a/sax/inc/sax/fshelper.hxx b/sax/inc/sax/fshelper.hxx
index 89cf818..73d04eb 100644
--- a/sax/inc/sax/fshelper.hxx
+++ b/sax/inc/sax/fshelper.hxx
@@ -56,10 +56,6 @@ public:
 
 ~FastSerializerHelper();
 
-void startElement(const char* elementName, ...);
-void singleElement(const char* elementName, ...);
-void endElement(const char* elementName);
-
 void startElementV(sal_Int32 elementTokenId, va_list args);
 void singleElementV(sal_Int32 elementTokenId, va_list args);
 
@@ -75,7 +71,6 @@ public:
 inline void endElementNS(sal_Int32 namespaceTokenId, sal_Int32 
elementTokenId)
 { endElement( FSNS( namespaceTokenId, elementTokenId ) ); }
 
-void singleElement(const char* elementName, XFastAttributeListRef 
xAttrList);
 inline void singleElement(sal_Int32 elementTokenId, XFastAttributeListRef 
xAttrList)
 { singleElementV(elementTokenId, xAttrList); }
 void singleElementV(sal_Int32 elementTokenId, XFastAttributeListRef 
xAttrList);
commit 0d7e73ac445d2e3fc8ed5ff2d6cf289d2b367a56
Author: Alexander Bergmann myadd...@gmx.de
Date:   Mon Jan 16 12:26:11 2012 +0100

Removing unused code

diff --git a/sax/source/tools/fshelper.cxx b/sax/source/tools/fshelper.cxx
index 89c2b1a..6cdd39d 100644
--- a/sax/source/tools/fshelper.cxx
+++ b/sax/source/tools/fshelper.cxx
@@ -29,49 +29,6 @@ FastSerializerHelper::~FastSerializerHelper()
 delete mpSerializer;
 }
 
-void FastSerializerHelper::startElement(const char* elementName, ...)
-{
-FastAttributeList* pAttrList = new FastAttributeList( mxTokenHandler );
-va_list args;
-va_start(args, elementName);
-while (true)
-{
-const char* pName = va_arg(args, const char*);
-if (!pName)
-break;
-const char* pValue = va_arg(args, const char*);
-if (pValue)
-pAttrList-addUnknown(pName, pValue);
-}
-va_end(args);
-const 
com::sun::star::uno::Referencecom::sun::star::xml::sax::XFastAttributeList 
xAttrList(pAttrList);
-mpSerializer-startUnknownElement(::rtl::OUString(), 
::rtl::OUString::createFromAscii(elementName), xAttrList);
-}
-
-void FastSerializerHelper::singleElement(const char* elementName, ...)
-{
-FastAttributeList* pAttrList = new FastAttributeList( mxTokenHandler );
-va_list args;
-va_start(args, elementName);
-while (true)
-{
-const char* pName = va_arg(args, const char*);
-if (!pName)
-break;
-const char* pValue = va_arg(args, const char*);
-if (pValue)
-pAttrList-addUnknown(pName, pValue);
-}
-va_end(args);
-const 
com::sun::star::uno::Referencecom::sun::star::xml::sax::XFastAttributeList 
xAttrList(pAttrList);
-mpSerializer-singleUnknownElement(::rtl::OUString(), 
::rtl::OUString::createFromAscii(elementName), xAttrList);
-}
-
-void FastSerializerHelper::endElement(const char* elementName)
-{
-mpSerializer-endUnknownElement(::rtl::OUString(), 
::rtl::OUString::createFromAscii(elementName));
-}
-
 void FastSerializerHelper::startElementV(sal_Int32 elementTokenId, va_list 
args)
 {
 FastAttributeList* pAttrList = new FastAttributeList( mxTokenHandler );
@@ -119,11 +76,6 @@ void FastSerializerHelper::startElementV(sal_Int32 
elementTokenId, XFastAttribut
 }
 
 
-void FastSerializerHelper::singleElement(const char* elementName, 
XFastAttributeListRef xAttrList)
-{
-mpSerializer-singleUnknownElement(::rtl::OUString(), 
::rtl::OUString::createFromAscii(elementName), xAttrList);
-}
-
 void FastSerializerHelper::singleElementV(sal_Int32 elementTokenId, 
XFastAttributeListRef xAttrList)
 {
 mpSerializer-singleFastElement(elementTokenId, xAttrList);
diff --git a/unusedcode.easy b/unusedcode.easy
index 87e2618..b1dcbcd 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1776,10 +1776,6 @@ sax::Converter::clearUndefinedChars(rtl::OUString, 
rtl::OUString const)
 sax::Converter::convertAny(com::sun::star::uno::Any, rtl::OUString const, 
rtl::OUString const)
 sax::Converter::convertDouble(double, rtl::OUString const, short)
 sax::Converter::convertNumber64(rtl::OUStringBuffer, long)
-sax_fastparser::FastSerializerHelper::endElement(char const*)
-sax_fastparser::FastSerializerHelper::singleElement(char const*, ...)
-sax_fastparser::FastSerializerHelper::singleElement(char const*, 
com::sun::star::uno::Referencecom::sun::star::xml::sax::XFastAttributeList)
-sax_fastparser::FastSerializerHelper::startElement(char const*, ...)
 

[Libreoffice-commits] .: sal/StaticLibrary_salcpprt.mk

[Norbert Thiebaud]

 sal/StaticLibrary_salcpprt.mk |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit a56cf2216105065b7576ff695cf376bc58b12346
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Mon Jan 16 17:11:05 2012 -0600

try to solve tml_'s detected dependencies issue with salcpprt

diff --git a/sal/StaticLibrary_salcpprt.mk b/sal/StaticLibrary_salcpprt.mk
index 79583a6..65bd100 100644
--- a/sal/StaticLibrary_salcpprt.mk
+++ b/sal/StaticLibrary_salcpprt.mk
@@ -33,6 +33,12 @@ $(eval $(call gb_StaticLibrary_add_defs,salcpprt, \
$(LFS_CFLAGS) \
 ))
 
+$(eval $(call gb_StaticLibrary_set_include,salcpprt,\
+$$(INCLUDE) \
+-I$(realpath $(SRCDIR)/sal/inc) \
+))
+
+
 $(eval $(call gb_StaticLibrary_add_exception_objects,salcpprt, \
sal/cpprt/operators_new_delete \
 ))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - sfx2/inc sfx2/source sw/source

[August Sodora]

 sfx2/inc/arrdecl.hxx |4 
 sfx2/inc/sfx2/minarray.hxx   |  266 ---
 sfx2/inc/sfx2/minstack.hxx   |   33 
 sfx2/source/control/dispatch.cxx |   87 +---
 sw/source/ui/utlui/gloslst.cxx   |   73 --
 5 files changed, 68 insertions(+), 395 deletions(-)

New commits:
commit 4f8efe5ca7e6075acbb8014a221a260f9ab81474
Author: August Sodora aug...@gmail.com
Date:   Mon Jan 16 20:21:02 2012 -0500

Remove *_OBJSTACK, *_OBJARRAY

diff --git a/sfx2/inc/sfx2/minarray.hxx b/sfx2/inc/sfx2/minarray.hxx
index a419588..44df912 100644
--- a/sfx2/inc/sfx2/minarray.hxx
+++ b/sfx2/inc/sfx2/minarray.hxx
@@ -36,272 +36,6 @@
 #include tools/solar.h
 #include tools/debug.hxx
 
-#define DECL_OBJARRAY( ARR, T, nI, nG ) \
-class ARR\
-{\
-private:\
-T*   pData;\
-sal_uInt16  nUsed;\
-sal_uInt8   nGrow;\
-sal_uInt8nUnused;\
-public:\
-ARR( sal_uInt8 nInitSize = nI, sal_uInt8 nGrowSize = nG );\
-ARR( const ARR rOrig );\
-~ARR();\
-\
-ARR operator= ( const ARR rOrig );\
-\
-const T GetObject( sal_uInt16 nPos ) const; \
-T GetObject( sal_uInt16 nPos ); \
-\
-void Insert( sal_uInt16 nPos, const T rElem );\
-void Insert( sal_uInt16 nPos, const T rElems, sal_uInt16 nLen );\
-void Append( const T rElem );\
-\
-sal_Bool Remove( const T rElem );\
-sal_uInt16 Remove( sal_uInt16 nPos, sal_uInt16 nLen );\
-\
-sal_uInt16 Count() const { return nUsed; }\
-T* operator*();\
-const T operator[]( sal_uInt16 nPos ) const;\
-T operator[]( sal_uInt16 nPos );\
-\
-sal_Bool Contains( const T rItem ) const;\
-void Clear() { Remove( 0, Count() ); }\
-};\
-\
-inline void ARR::Insert( sal_uInt16 nPos, const T rElem )\
-{\
-Insert( nPos, rElem, 1 );\
-}\
-\
-inline T* ARR::operator*()\
-{\
-return ( nUsed==0 ? 0 : pData );\
-} \
-inline const T ARR::operator[]( sal_uInt16 nPos ) const\
-{\
-DBG_ASSERT( nPos  nUsed,  ); \
-return *(pData+nPos);\
-} \
-inline T ARR::operator [] (sal_uInt16 nPos) \
-{\
-DBG_ASSERT( nPos  nUsed,  ); \
-return *(pData+nPos); \
-} \
-inline const T ARR::GetObject( sal_uInt16 nPos ) const { return 
operator[](nPos); } \
-inline T ARR::GetObject( sal_uInt16 nPos ) { return operator[](nPos); } \
-
-#ifndef _lint
-// String too long
-
-#define IMPL_OBJARRAY( ARR, T ) \
-ARR::ARR( sal_uInt8 nInitSize, sal_uInt8 nGrowSize ): \
-nUsed(0), \
-nGrow( nGrowSize ? nGrowSize : 1 ), \
-nUnused(nInitSize) \
-{ \
-if ( nInitSize != 0 ) \
-{ \
-size_t nBytes = nInitSize * sizeof(T); \
-pData = (T*) new char[ nBytes ]; \
-memset( pData, 0, nBytes ); \
-} \
-else \
-pData = 0; \
-} \
-\
-ARR::ARR( const ARR rOrig ) \
-{ \
-nUsed = rOrig.nUsed; \
-nGrow = rOrig.nGrow; \
-nUnused = rOrig.nUnused; \
-\
-if ( rOrig.pData != 0 ) \
-{ \
-size_t nBytes = (nUsed + nUnused) * sizeof(T); \
-pData = (T*) new char [ nBytes ]; \
-memset( pData, 0, nBytes ); \
-for ( sal_uInt16 n = 0; n  nUsed; ++n ) \
-*(pData+n) = *(rOrig.pData+n); \
-} \
-else \
-pData = 0; \
-} \
-\
-ARR::~ARR() \
-{ \
-for ( sal_uInt16 n = 0; n  nUsed; ++n ) \
-( pData+n )-T::~T(); \
-delete[] (char*) pData;\
-} \
-\
-ARR ARR::operator= ( const ARR rOrig )\
-{ \
-for ( sal_uInt16 n = 0; n  nUsed; ++n ) \
-( pData+n )-T::~T(); \
-delete[] (char*) pData;\
-\
-nUsed = rOrig.nUsed; \
-nGrow = rOrig.nGrow; \
-nUnused = rOrig.nUnused; \
-\
-if ( rOrig.pData != 0 ) \
-{ \
-size_t nBytes = (nUsed + nUnused) * sizeof(T); \
-pData = (T*) new char[ nBytes ]; \
-memset( pData, 0, nBytes ); \
-for ( sal_uInt16 n = 0; n  nUsed; ++n ) \
-*(pData+n) = *(rOrig.pData+n); \
-} \
-else \
-pData = 0; \
-return *this; \
-} \
-\
-void ARR::Append( const T aElem ) \
-{ \
- \
-if ( nUnused == 0 ) \
-{ \
-sal_uInt16 nNewSize = (nUsed == 1) ? (nGrow==1 ? 2 : nGrow) : 
nUsed+nGrow; \
-size_t nBytes = nNewSize * sizeof(T); \
-T* pNewData = (T*) new char[ nBytes ]; \
-memset( pNewData, 0, nBytes ); \
-if ( pData ) \
-{ \
-memcpy( pNewData, pData, nUsed * sizeof(T) ); \
-delete[] (char*) pData;\
-} \
-nUnused = (sal_uInt8)(nNewSize-nUsed); \
-pData = pNewData; \
-} \
-\
- \
-pData[nUsed] = aElem; \
-++nUsed; \
---nUnused; \
-} \
-\
-sal_uInt16 ARR::Remove( sal_uInt16 nPos, sal_uInt16 nLen ) \
-{ \
-DBG_ASSERT( (nPos+nLen)  (nUsed+1),  ); \
-DBG_ASSERT( nLen  0,  ); \
-\
-nLen = Min( (sal_uInt16)(nUsed-nPos), (sal_uInt16)nLen ); \
-\
-if ( nLen == 0 ) \
-return 0; \
-\
-for ( sal_uInt16 n = nPos; n  (nPos+nLen); ++n ) \
-( pData+n )-T::~T(); \
-\
-if ( (nUsed-nLen) == 0 ) \
-{ \
-delete[] (char*) pData;\
-

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - configure.in scp2/source

[Bjoern Michaelsen]

 configure.in  |6 +++---
 scp2/source/ooo/file_ooo.scp  |9 +
 scp2/source/ooo/module_hidden_ooo.scp |3 +++
 3 files changed, 15 insertions(+), 3 deletions(-)

New commits:
commit db741827e630518e40006cbf7486bead92820300
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Jan 17 01:16:32 2012 +0100

add human theme to packaging

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index a3dd222..8e18e8e 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1294,6 +1294,15 @@ File gid_File_ImagesTango_Zip
 End
 #endif
 
+#ifdef THEME_HUMAN
+File gid_File_ImagesHuman_Zip
+TXT_FILE_BODY;
+Dir = gid_Brand_Dir_Share_Config;
+Name = images_human.zip;
+Styles = (PACKED);
+End
+#endif
+
 File gid_File_Share_Registry_Lingucomponent_Xcd
 TXT_FILE_BODY;
 Styles = (PACKED);
diff --git a/scp2/source/ooo/module_hidden_ooo.scp 
b/scp2/source/ooo/module_hidden_ooo.scp
index 024ec68..2588b5b 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -713,6 +713,9 @@ Module gid_Module_Root_Files_Images
 #ifdef THEME_HICONTRAST
  gid_File_ImagesHicontrast_Zip,
 #endif
+#ifdef THEME_HUMAN
+ gid_File_ImagesHuman_Zip,
+#endif
 #ifdef THEME_TANGO
  gid_File_ImagesTango_Zip
 #endif
commit 03351d7d10f06dbf9fb52343c9f1a360c17ef702
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Jan 17 01:13:09 2012 +0100

add human theme to configure

Conflicts:

configure.in

diff --git a/configure.in b/configure.in
index 824de63..c66a6c5 100644
--- a/configure.in
+++ b/configure.in
@@ -855,7 +855,7 @@ AC_ARG_WITH(vba-package-format,
 AC_ARG_WITH(theme,
 AS_HELP_STRING([--with-theme=theme1 theme2...],
 [Choose which themes to include. By default those themes with an '*' 
are included.
- Possible choices: *default, *crystal, *hicontrast, *oxygen, *tango, 
classic, industrial.]),
+ Possible choices: *default, *crystal, *hicontrast, *oxygen, *tango, 
classic, industrial, human.]),
 ,)
 
 AC_ARG_WITH(helppack-integration,
@@ -7992,8 +7992,8 @@ fi
 WITH_THEMES=
 for theme in $with_theme; do
 case $theme in
-default|crystal|hicontrast|oxygen|tango) : ;;
-*) AC_MSG_ERROR([Unknown value for --with-themes: $theme]) ;;
+default|crystal|hicontrast|oxygen|tango|human) : ;;
+*) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;;
 esac
 WITH_THEMES=$WITH_THEMES $theme
 SCPDEFS=$SCPDEFS -DTHEME_`echo $theme|tr '[[:lower:]]' '[[:upper:]]'`
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - configure.in sal/StaticLibrary_salcpprt.mk scp2/source

[Bjoern Michaelsen]

 configure.in  |4 ++--
 sal/StaticLibrary_salcpprt.mk |5 -
 scp2/source/ooo/file_ooo.scp  |9 +
 scp2/source/ooo/module_hidden_ooo.scp |3 +++
 4 files changed, 18 insertions(+), 3 deletions(-)

New commits:
commit 3c1ddd4de187363cf1c3f14c43b4a2c66b1de6d6
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Jan 17 01:16:32 2012 +0100

add human theme to packaging

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 5263c11..cae313a 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1295,6 +1295,15 @@ File gid_File_ImagesTango_Zip
 End
 #endif
 
+#ifdef THEME_HUMAN
+File gid_File_ImagesHuman_Zip
+TXT_FILE_BODY;
+Dir = gid_Brand_Dir_Share_Config;
+Name = images_human.zip;
+Styles = (PACKED);
+End
+#endif
+
 File gid_File_Share_Registry_Lingucomponent_Xcd
 TXT_FILE_BODY;
 Styles = (PACKED);
diff --git a/scp2/source/ooo/module_hidden_ooo.scp 
b/scp2/source/ooo/module_hidden_ooo.scp
index 867677d..67499de 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -711,6 +711,9 @@ Module gid_Module_Root_Files_Images
 #ifdef THEME_HICONTRAST
  gid_File_ImagesHicontrast_Zip,
 #endif
+#ifdef THEME_HUMAN
+ gid_File_ImagesHuman_Zip,
+#endif
 #ifdef THEME_TANGO
  gid_File_ImagesTango_Zip
 #endif
commit f8766b4c489e5fb7101ae71fbe41fceaff88f941
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Jan 17 01:13:09 2012 +0100

add human theme to configure

diff --git a/configure.in b/configure.in
index 20411f3..251cfa8 100644
--- a/configure.in
+++ b/configure.in
@@ -882,7 +882,7 @@ AC_ARG_WITH(vba-package-format,
 AC_ARG_WITH(theme,
 AS_HELP_STRING([--with-theme=theme1 theme2...],
 [Choose which themes to include. By default those themes with an '*' 
are included.
- Possible choices: *default, *crystal, *hicontrast, *oxygen, *tango, 
classic, industrial.]),
+ Possible choices: *default, *crystal, *hicontrast, *oxygen, *tango, 
classic, industrial, human.]),
 ,)
 
 AC_ARG_WITH(helppack-integration,
@@ -8753,7 +8753,7 @@ fi
 WITH_THEMES=
 for theme in $with_theme; do
 case $theme in
-default|crystal|hicontrast|oxygen|tango) : ;;
+default|crystal|hicontrast|oxygen|tango|human) : ;;
 *) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;;
 esac
 WITH_THEMES=$WITH_THEMES $theme
commit 605b8a0bc0201ea0bb07190a57213236dd009216
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Jan 17 01:09:48 2012 +0100

salcpprt also uses headers from sal_inc

diff --git a/sal/StaticLibrary_salcpprt.mk b/sal/StaticLibrary_salcpprt.mk
index 65bd100..2286e6c 100644
--- a/sal/StaticLibrary_salcpprt.mk
+++ b/sal/StaticLibrary_salcpprt.mk
@@ -27,7 +27,10 @@
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,salcpprt))
 
-$(eval $(call gb_StaticLibrary_add_package_headers,salcpprt,sal_generated))
+$(eval $(call gb_StaticLibrary_add_package_headers,salcpprt,\
+sal_generated \
+sal_inc \
+))
 
 $(eval $(call gb_StaticLibrary_add_defs,salcpprt, \
$(LFS_CFLAGS) \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basic/source

[August Sodora]

 basic/source/classes/sbintern.cxx |4 --
 basic/source/classes/sbxmod.cxx   |5 --
 basic/source/inc/sbintern.hxx |   65 --
 basic/source/runtime/runtime.cxx  |   14 +---
 basic/source/runtime/step1.cxx|5 --
 5 files changed, 2 insertions(+), 91 deletions(-)

New commits:
commit cd10d4e8a612f72bf2fa421bc1360d5230da505d
Author: August Sodora aug...@gmail.com
Date:   Mon Jan 16 20:42:36 2012 -0500

Remove SbErrorStack[Entry]

diff --git a/basic/source/classes/sbintern.cxx 
b/basic/source/classes/sbintern.cxx
index 1993aa6..1f3a40f 100644
--- a/basic/source/classes/sbintern.cxx
+++ b/basic/source/classes/sbintern.cxx
@@ -36,8 +36,6 @@
 #include codegen.hxx
 #include basic/basmgr.hxx
 
-SV_IMPL_PTRARR(SbErrorStack, SbErrorStackEntry*)
-
 SbiGlobals* GetSbData()
 {
 SbiGlobals** pp = (SbiGlobals**) ::GetAppData( SHL_SBC );
@@ -63,7 +61,6 @@ SbiGlobals::SbiGlobals()
 bCompiler = sal_False;
 bGlobalInitErr = sal_False;
 bRunInit = sal_False;
-pErrStack = NULL;
 pTransliterationWrapper = NULL;
 bBlockCompilerError = sal_False;
 pAppBasMgr = NULL;
@@ -72,7 +69,6 @@ SbiGlobals::SbiGlobals()
 
 SbiGlobals::~SbiGlobals()
 {
-delete pErrStack;
 delete pSbFac;
 delete pUnoFac;
 delete pTransliterationWrapper;
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index b492fee..d61b63c 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -1155,11 +1155,6 @@ sal_uInt16 SbModule::Run( SbMethod* pMeth )
 }
 }
 
-// Delete the Error-Stack
-SbErrorStack* rErrStack = GetSbData()-pErrStack;
-delete rErrStack;
-rErrStack = NULL;
-
 if( nMaxCallLevel == 0 )
 {
 #ifdef UNX
diff --git a/basic/source/inc/sbintern.hxx b/basic/source/inc/sbintern.hxx
index ac6b883..bc35651 100644
--- a/basic/source/inc/sbintern.hxx
+++ b/basic/source/inc/sbintern.hxx
@@ -87,70 +87,6 @@ public:
 SbModule* FindClass( const String rClassName );
 };
 
-// stack for the SbiRuntime chain which is removed in the case of an error
-class BASIC_DLLPUBLIC SbErrorStackEntry
-{
-public:
-SbErrorStackEntry(SbMethodRef aM, xub_StrLen nL, xub_StrLen nC1, 
xub_StrLen nC2)
-: aMethod(aM), nLine(nL), nCol1(nC1), nCol2(nC2) {}
-SbMethodRef aMethod;
-xub_StrLen nLine;
-xub_StrLen nCol1, nCol2;
-};
-
-typedef sal_Bool (*FnForEach_SbErrorStack)( const SbErrorStackEntry* , void* 
);
-class BASIC_DLLPUBLIC SbErrorStack: public SvPtrarr
-{
-public:
-SbErrorStack( sal_uInt16 nIni=1, sal_uInt8 nG=1 )
-: SvPtrarr(nIni,nG) {}
-~SbErrorStack() { DeleteAndDestroy( 0, Count() ); }
-void Insert( const SbErrorStack *pI, sal_uInt16 nP,
-sal_uInt16 nS = 0, sal_uInt16 nE = USHRT_MAX ) {
-SvPtrarr::Insert((const SvPtrarr*)pI, nP, nS, nE);
-}
-void Insert( const SbErrorStackEntry*  aE, sal_uInt16 nP ) {
-SvPtrarr::Insert((const VoidPtr )aE, nP );
-}
-void Insert( const SbErrorStackEntry* *pE, sal_uInt16 nL, sal_uInt16 nP ) {
-SvPtrarr::Insert( (const VoidPtr *)pE, nL, nP );
-}
-void Replace( const SbErrorStackEntry*  aE, sal_uInt16 nP ) {
-SvPtrarr::Replace( (const VoidPtr )aE, nP );
-}
-void Replace( const SbErrorStackEntry* *pE, sal_uInt16 nL, sal_uInt16 nP ) 
{
-SvPtrarr::Replace( (const VoidPtr*)pE, nL, nP );
-}
-void Remove( sal_uInt16 nP, sal_uInt16 nL = 1) {
-SvPtrarr::Remove(nP,nL);
-}
-const SbErrorStackEntry** GetData() const {
-return (const SbErrorStackEntry**)SvPtrarr::GetData();
-}
-void ForEach( CONCAT( FnForEach_, SbErrorStack ) fnForEach, void* pArgs = 
0 )
-{
-_ForEach( 0, nA, (FnForEach_SvPtrarr)fnForEach, pArgs );
-}
-void ForEach( sal_uInt16 nS, sal_uInt16 nE,
-CONCAT( FnForEach_, SbErrorStack ) fnForEach, void* pArgs 
= 0 )
-{
-_ForEach( nS, nE, (FnForEach_SvPtrarr)fnForEach, pArgs );
-}
-SbErrorStackEntry* operator[]( sal_uInt16 nP )const  {
-return (SbErrorStackEntry*)SvPtrarr::operator[](nP); }
-SbErrorStackEntry* GetObject( sal_uInt16 nP )const  {
-return (SbErrorStackEntry*)SvPtrarr::GetObject(nP); }
-
-sal_uInt16 GetPos( const SbErrorStackEntry*  aE ) const {
-return SvPtrarr::GetPos((const VoidPtr )aE);
-}
-void DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL=1 );
-private:
-BASIC_DLLPRIVATE SbErrorStack( const SbErrorStack );
-BASIC_DLLPRIVATE SbErrorStack operator=( const SbErrorStack );
-};
-
-
 struct SbiGlobals
 {
 SbiInstance*pInst;  // all active runtime instances
@@ -172,7 +108,6 @@ struct SbiGlobals
 sal_BoolbGlobalInitErr;
 sal_BoolbRunInit;   // sal_True, if RunInit active from 
the Basic
 String  aErrMsg;// buffer for GetErrorText()
-SbErrorStack*   pErrStack;  // 

[Libreoffice-commits] .: svx/inc svx/source

[August Sodora]

 svx/inc/svx/rulritem.hxx   |   31 +++
 svx/source/dialog/rulritem.cxx |   37 +
 2 files changed, 12 insertions(+), 56 deletions(-)

New commits:
commit d319387526870f34c49b3ef337b1b0d55767f3fe
Author: August Sodora aug...@gmail.com
Date:   Mon Jan 16 22:03:51 2012 -0500

SvPtrarr-std::vector

diff --git a/svx/inc/svx/rulritem.hxx b/svx/inc/svx/rulritem.hxx
index 4689665..e1c4413 100644
--- a/svx/inc/svx/rulritem.hxx
+++ b/svx/inc/svx/rulritem.hxx
@@ -28,14 +28,10 @@
 #ifndef _SVX_RULRITEM_HXX
 #define _SVX_RULRITEM_HXX
 
-// include ---
-
-
 #include tools/gen.hxx
 #include svl/poolitem.hxx
 #include svx/svxdllapi.h
-
-// class SvxLongLRSpaceItem --
+#include vector
 
 class SVX_DLLPUBLIC SvxLongLRSpaceItem : public SfxPoolItem
 {
@@ -71,8 +67,6 @@ public:
 voidSetRight(long lArgRight) {lRight=lArgRight;}
 };
 
-// class SvxLongULSpaceItem --
-
 class SVX_DLLPUBLIC SvxLongULSpaceItem : public SfxPoolItem
 {
 longlLeft; // nLeft or the negative first-line indentation
@@ -107,8 +101,6 @@ public:
 voidSetLower(long lArgRight) {lRight=lArgRight;}
 };
 
-// class SvxPagePosSizeItem --
-
 class SVX_DLLPUBLIC SvxPagePosSizeItem : public SfxPoolItem
 {
 Point aPos;
@@ -140,8 +132,6 @@ public:
 longGetHeight() const { return lHeight; }
 };
 
-// struct SvxColumnDescription ---
-
 struct SvxColumnDescription
 {
 long nStart;/* Start of the column */
@@ -185,13 +175,9 @@ struct SvxColumnDescription
 long GetWidth() const { return nEnd - nStart; }
 };
 
-// class SvxColumnItem ---
-
-typedef SvPtrarr SvxColumns;
-
 class SVX_DLLPUBLIC SvxColumnItem : public SfxPoolItem
 {
-SvxColumns aColumns;// Column array
+std::vectorSvxColumnDescription aColumns;// Column array
 longnLeft,  // Left edge for the table
nRight;  // Right edge for the table; for columns always
 // equal to the surrounding frame
@@ -199,8 +185,6 @@ class SVX_DLLPUBLIC SvxColumnItem : public SfxPoolItem
 sal_uInt8  bTable;  // table?
 sal_uInt8  bOrtho; // evenly spread columns
 
-void DeleteAndDestroyColumns();
-
 protected:
 virtual int  operator==( const SfxPoolItem ) const;
 
@@ -225,14 +209,13 @@ public:
 
 const SvxColumnItem operator=(const SvxColumnItem );
 
-sal_uInt16 Count() const { return aColumns.Count(); }
+sal_uInt16 Count() const { return aColumns.size(); }
 SvxColumnDescription operator[](sal_uInt16 i)
-{ return *(SvxColumnDescription*)aColumns[i]; }
+{ return aColumns[i]; }
 const SvxColumnDescription operator[](sal_uInt16 i) const
-{ return *(SvxColumnDescription*)aColumns[i]; }
+{ return aColumns[i]; }
 void Insert(const SvxColumnDescription rDesc, sal_uInt16 nPos) {
-SvxColumnDescription* pDesc = new SvxColumnDescription(rDesc);
-aColumns.Insert(pDesc, nPos);
+aColumns.insert(aColumns.begin() + nPos, rDesc);
 }
 void   Append(const SvxColumnDescription rDesc) { Insert(rDesc, Count()); 
}
 void   SetLeft(long left) { nLeft = left; }
@@ -251,7 +234,7 @@ public:
 void   SetOrtho(sal_Bool bVal) { bOrtho = bVal; }
 sal_Bool   IsOrtho () const { return sal_False ; }
 
-sal_Bool IsConsistent() const  { return nActColumn  aColumns.Count(); }
+sal_Bool IsConsistent() const  { return nActColumn  aColumns.size(); }
 long   GetVisibleRight() const;// right visible edge of the current column
 };
 
diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx
index 640ce1f..1be621b 100644
--- a/svx/source/dialog/rulritem.cxx
+++ b/svx/source/dialog/rulritem.cxx
@@ -429,18 +429,6 @@ SvxPagePosSizeItem::SvxPagePosSizeItem()
 
 //
 
-void SvxColumnItem::DeleteAndDestroyColumns()
-{
-for( sal_uInt16 i = aColumns.Count(); i0; )
-{
-SvxColumnDescription *pTmp = (SvxColumnDescription *)aColumns[--i];
-aColumns.Remove( i );
-delete pTmp;
-}
-}
-
-//
-
 int SvxColumnItem::operator==(const SfxPoolItem rCmp) const
 {
 if(!SfxPoolItem::operator==(rCmp) ||
@@ -515,50 +503,35 @@ SvxColumnItem::SvxColumnItem( sal_uInt16 nActCol, 
sal_uInt16 left, sal_uInt16 ri
 {
 }
 
-//
-
 SvxColumnItem::SvxColumnItem( const SvxColumnItem rCopy ) :
-
 SfxPoolItem( rCopy ),
-
   aColumns  ( (sal_uInt8)rCopy.Count() ),
   nLeft ( rCopy.nLeft ),
   nRight( 

[Libreoffice-commits] .: extensions/source offapi/com offapi/UnoApi_offapi.mk ucb/source

[Thorsten Behrens]

 extensions/source/update/feed/updatefeed.cxx |   13 -
 offapi/UnoApi_offapi.mk  |1 
 offapi/com/sun/star/ucb/OpenCommandArgument3.idl |   56 +++
 ucb/source/ucp/webdav/DAVResourceAccess.cxx  |   14 -
 ucb/source/ucp/webdav/DAVResourceAccess.hxx  |5 ++
 ucb/source/ucp/webdav/DAVSession.hxx |7 ++
 ucb/source/ucp/webdav/DAVSessionFactory.cxx  |7 +-
 ucb/source/ucp/webdav/DAVSessionFactory.hxx  |5 ++
 ucb/source/ucp/webdav/NeonSession.cxx|   36 +-
 ucb/source/ucp/webdav/NeonSession.hxx|5 +-
 ucb/source/ucp/webdav/webdavcontent.cxx  |   21 ++--
 ucb/source/ucp/webdav/webdavcontent.hxx  |4 -
 12 files changed, 157 insertions(+), 17 deletions(-)

New commits:
commit 09954fc863c8ee900f157cab4458e1dcf51493d3
Author: Thorsten Behrens tbehr...@suse.com
Date:   Tue Jan 17 04:59:56 2012 +0100

Fix UpdateCheck clog up server by keeping connection alive

The update check protocol uses the webdav ucp, which uses neon,
which in turn defaults to keeping the connection alive. this is nice
for webdav, but disastrous for millions of clients phoning home to
the same server.

Using neon directly in updatefeed.cxx is not an option, due to the
thread safety problems around that (see e.g. rhbz#544619) - so we
had to extend it to accept connection options, and reuse the
existing webdav provider.

diff --git a/extensions/source/update/feed/updatefeed.cxx 
b/extensions/source/update/feed/updatefeed.cxx
index 09a98a7..944b7be 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -31,6 +31,7 @@
 #include cppuhelper/implbase4.hxx
 #include cppuhelper/implementationentry.hxx
 #include com/sun/star/beans/Property.hpp
+#include com/sun/star/beans/PropertyValue.hpp
 #include com/sun/star/beans/XPropertySetInfo.hpp
 #include com/sun/star/beans/NamedValue.hpp
 #include com/sun/star/configuration/theDefaultProvider.hpp
@@ -47,7 +48,7 @@
 #include com/sun/star/ucb/XContentIdentifierFactory.hpp
 #include com/sun/star/ucb/XContentProvider.hpp
 #include com/sun/star/ucb/XInteractionSupplyAuthentication.hpp
-#include com/sun/star/ucb/OpenCommandArgument2.hpp
+#include com/sun/star/ucb/OpenCommandArgument3.hpp
 #include com/sun/star/ucb/OpenMode.hpp
 #include com/sun/star/sdbc/XRow.hpp
 #include com/sun/star/task/PasswordContainerInteractionHandler.hpp
@@ -481,10 +482,18 @@ UpdateInformationProvider::load(const rtl::OUString rURL)
 uno::Reference ucb::XCommandProcessor  
xCommandProcessor(m_xContentProvider-queryContent(xId), uno::UNO_QUERY_THROW);
 rtl::Reference ActiveDataSink  aSink(new ActiveDataSink());
 
-ucb::OpenCommandArgument2 aOpenArgument;
+// Disable KeepAlive in webdav - don't want millions of office
+// instances phone home  clog up servers
+uno::Sequence beans::PropertyValue  aProps( 1 );
+aProps[ 0 ] = beans::PropertyValue(
+UNISTRING(KeepAlive), -1,
+uno::makeAny(sal_False), beans::PropertyState_DIRECT_VALUE);
+
+ucb::OpenCommandArgument3 aOpenArgument;
 aOpenArgument.Mode = ucb::OpenMode::DOCUMENT;
 aOpenArgument.Priority = 32768;
 aOpenArgument.Sink = *aSink;
+aOpenArgument.OpeningFlags = aProps;
 
 ucb::Command aCommand;
 aCommand.Name = UNISTRING(open);
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index e8f623e..23c4523 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -3811,6 +3811,7 @@ $(eval $(call 
gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/ucb,\
NumberedSortingInfo \
OpenCommandArgument \
OpenCommandArgument2 \
+   OpenCommandArgument3 \
OpenMode \
OutgoingMessageState \
PostCommandArgument \
diff --git a/offapi/com/sun/star/ucb/OpenCommandArgument3.idl 
b/offapi/com/sun/star/ucb/OpenCommandArgument3.idl
new file mode 100644
index 000..0c6925a
--- /dev/null
+++ b/offapi/com/sun/star/ucb/OpenCommandArgument3.idl
@@ -0,0 +1,56 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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 Thorsten Behrens tbehr...@suse.com (initial developer)
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, 

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - desktop/branding desktop/Module_desktop.mk desktop/Package_branding.mk desktop/Zip_brand_dev.mk desktop/Zip_brand.mk desktop/Zip_shell.mk scp2/sourc

[Thorsten Behrens]

 desktop/Module_desktop.mk|2 -
 desktop/Package_branding.mk  |   32 
 desktop/Zip_brand.mk |   45 ++-
 desktop/Zip_brand_dev.mk |   45 +++
 desktop/Zip_shell.mk |   38 -
 desktop/branding/Makefile|   50 ---
 scp2/source/ooo/common_brand.scp |   12 +
 7 files changed, 82 insertions(+), 142 deletions(-)

New commits:
commit 2009da99f38eb8f7571a505477202e126a6dd173
Author: Thorsten Behrens tbehr...@suse.com
Date:   Mon Jan 16 18:44:38 2012 +0100

Fix configurable branding.

Bin the submakefile, use direct Zip cp calls. This also fixes
the non-working deps towards default_images.

diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 8439d38..7ce47f7 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -45,11 +45,9 @@ $(eval $(call gb_Module_add_targets,desktop,\
 Library_sofficeapp \
 Library_spl \
 Library_unopkgapp \
-Package_branding \
 Package_intro \
 Zip_brand \
 Zip_brand_dev \
-Zip_shell \
 ))
 
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
diff --git a/desktop/Package_branding.mk b/desktop/Package_branding.mk
deleted file mode 100644
index bd2f36f..000
--- a/desktop/Package_branding.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- 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) 2011 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_Package_Package,desktop_branding,$(WORKDIR)/CustomTarget/desktop/branding))
-
-$(eval $(call gb_Package_add_customtarget,desktop_branding,desktop/branding))
-
-# vim: set ts=4 sw=4 et:
diff --git a/desktop/Zip_brand.mk b/desktop/Zip_brand.mk
index 03ba5ec..01ac87c 100644
--- a/desktop/Zip_brand.mk
+++ b/desktop/Zip_brand.mk
@@ -25,15 +25,48 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_Zip_Zip,brand/intro,$(WORKDIR)/CustomTarget/desktop/branding))
+$(eval $(call gb_Zip_Zip,brand/intro,$(WORKDIR)/Zip/brand_intro))
 
-$(eval $(call gb_Zip_add_files,brand/intro,\
-about.png \
-intro.png \
+$(eval $(call gb_Zip_add_file,brand/intro,about.png,\
+   $(if $(ABOUT_BITMAP),\
+   $(ABOUT_BITMAP),\
+   $(SRCDIR)/default_images/brand/about.png)\
 ))
 
-$(eval $(call gb_Zip_add_dependencies,brand/intro,\
-$(call gb_Package_get_target,desktop_branding) \
+$(eval $(call gb_Zip_add_file,brand/intro,intro.png,\
+   $(if $(INTRO_BITMAP),\
+   $(INTRO_BITMAP),\
+   $(SRCDIR)/default_images/brand/intro.png)\
+))
+
+$(eval $(call gb_Zip_add_file,brand/intro,shell/backing_left.png,\
+   $(if $(STARTCENTER_LEFT_BITMAP),\
+   $(STARTCENTER_LEFT_BITMAP),\
+   $(SRCDIR)/default_images/brand/shell/backing_left.png)\
+))
+
+$(eval $(call gb_Zip_add_file,brand/intro,shell/backing_right.png,\
+   $(if $(STARTCENTER_RIGHT_BITMAP),\
+   $(STARTCENTER_RIGHT_BITMAP),\
+   $(SRCDIR)/default_images/brand/shell/backing_right.png)\
+))
+
+$(eval $(call gb_Zip_add_file,brand/intro,shell/backing_space.png,\
+   $(if $(STARTCENTER_SPACE_BITMAP),\
+   $(STARTCENTER_SPACE_BITMAP),\
+   $(SRCDIR)/default_images/brand/shell/backing_space.png)\
+))
+
+$(eval $(call gb_Zip_add_file,brand/intro,shell/backing_rtl_left.png,\
+   $(if $(STARTCENTER_RTL_LEFT_BITMAP),\
+   $(STARTCENTER_RTL_LEFT_BITMAP),\
+   $(SRCDIR)/default_images/brand/shell/backing_rtl_left.png)\
+))
+
+$(eval $(call gb_Zip_add_file,brand/intro,shell/backing_rtl_right.png,\
+   $(if $(STARTCENTER_RTL_RIGHT_BITMAP),\
+   $(STARTCENTER_RTL_RIGHT_BITMAP),\
+   $(SRCDIR)/default_images/brand/shell/backing_rtl_right.png)\
 ))
 
 # vim: set ts=4 sw=4 et:
diff 

[Libreoffice-commits] .: 2 commits - basic/inc basic/source

[August Sodora]

 basic/inc/basic/basmgr.hxx   |2 --
 basic/inc/basic/basrdll.hxx  |2 --
 basic/source/runtime/basrdll.cxx |2 --
 3 files changed, 6 deletions(-)

New commits:
commit d9ce7a484fdb870a5f41dca205469ddcf7f8b608
Author: August Sodora aug...@gmail.com
Date:   Mon Jan 16 23:35:26 2012 -0500

Remove unused SttResMgr from basic

diff --git a/basic/inc/basic/basrdll.hxx b/basic/inc/basic/basrdll.hxx
index 72e32d7..55ac29d 100644
--- a/basic/inc/basic/basrdll.hxx
+++ b/basic/inc/basic/basrdll.hxx
@@ -37,7 +37,6 @@ class ResMgr;
 class BASIC_DLLPUBLIC BasicDLL
 {
 private:
-ResMgr* pSttResMgr;
 ResMgr* pBasResMgr;
 
 sal_BoolbDebugMode;
@@ -47,7 +46,6 @@ public:
 BasicDLL();
 ~BasicDLL();
 
-ResMgr* GetSttResMgr() const { return pSttResMgr; }
 ResMgr* GetBasResMgr() const { return pBasResMgr; }
 
 static void BasicBreak();
diff --git a/basic/source/runtime/basrdll.cxx b/basic/source/runtime/basrdll.cxx
index 63050d9..e55910b 100644
--- a/basic/source/runtime/basrdll.cxx
+++ b/basic/source/runtime/basrdll.cxx
@@ -46,7 +46,6 @@ BasicDLL::BasicDLL()
 {
  *(BasicDLL**)GetAppData(SHL_BASIC) = this;
 ::com::sun::star::lang::Locale aLocale = 
Application::GetSettings().GetUILocale();
-pSttResMgr = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(stt), aLocale );
 pBasResMgr = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(sb), aLocale );
 bDebugMode = sal_False;
 bBreakEnabled = sal_True;
@@ -54,7 +53,6 @@ BasicDLL::BasicDLL()
 
 BasicDLL::~BasicDLL()
 {
-delete pSttResMgr;
 delete pBasResMgr;
 }
 
commit 4383bb532e2663823f54dc922f3b4e2f0703f241
Author: August Sodora aug...@gmail.com
Date:   Mon Jan 16 23:31:59 2012 -0500

Remove unused function

diff --git a/basic/inc/basic/basmgr.hxx b/basic/inc/basic/basmgr.hxx
index 2d238d1..4b4bf38 100644
--- a/basic/inc/basic/basmgr.hxx
+++ b/basic/inc/basic/basmgr.hxx
@@ -259,8 +259,6 @@ private:
const String LinkTargetURL );
 };
 
-BASIC_DLLPUBLIC void SetAppBasicManager( BasicManager* pBasMgr );
-
 #endif  //_BASMGR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sal/StaticLibrary_salcpprt.mk

[David Tardon]

 sal/StaticLibrary_salcpprt.mk |6 --
 1 file changed, 6 deletions(-)

New commits:
commit 750f32c6ccd4c5dcf0036b0aa421bedea4e686f5
Author: David Tardon dtar...@redhat.com
Date:   Tue Jan 17 07:23:40 2012 +0100

Revert try to solve tml_'s detected dependencies issue with salcpprt

Bjoern fixed it by adding proper package deps

This reverts commit a56cf2216105065b7576ff695cf376bc58b12346.

diff --git a/sal/StaticLibrary_salcpprt.mk b/sal/StaticLibrary_salcpprt.mk
index 2286e6c..b56d4a8 100644
--- a/sal/StaticLibrary_salcpprt.mk
+++ b/sal/StaticLibrary_salcpprt.mk
@@ -36,12 +36,6 @@ $(eval $(call gb_StaticLibrary_add_defs,salcpprt, \
$(LFS_CFLAGS) \
 ))
 
-$(eval $(call gb_StaticLibrary_set_include,salcpprt,\
-$$(INCLUDE) \
--I$(realpath $(SRCDIR)/sal/inc) \
-))
-
-
 $(eval $(call gb_StaticLibrary_add_exception_objects,salcpprt, \
sal/cpprt/operators_new_delete \
 ))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: xmloff/source

[Stephan Bergmann]

 xmloff/source/text/txtparae.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7ca7690f84cfab87ddd25fa1200b11625d1f7ece
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Jan 17 08:47:22 2012 +0100

Better fix for WaE signed/unsigned comparison.

diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 96316d1..6db50ff 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -856,7 +856,7 @@ void XMLTextParagraphExport::exportListChange(
 
 if ( nListLevelsToBeClosed  0 
  pListElements 
- pListElements-size() = ( 2 * sal::static_int_cast sal_uInt16 
(nListLevelsToBeClosed) ) )
+ pListElements-size() = sal::static_int_cast sal_uInt32 ( 2 * 
nListLevelsToBeClosed ) )
 {
 do {
 for(size_t j = 0; j  2; ++j)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sfx2/source

[Stephan Bergmann]

 sfx2/source/control/dispatch.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e75308f9099e3baebe7b283241e8b2fd799ef9ff
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Jan 17 08:55:50 2012 +0100

Avoid compilation problem.

diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 4d3f2d7..c1d41e0 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -572,7 +572,7 @@ sal_Bool SfxDispatcher::CheckVirtualStack( const SfxShell 
rShell, sal_Bool bDee
 SFX_STACK(SfxDispatcher::CheckVirtualStack);
 
 SfxShellStack_Impl aStack( pImp-aStack );
-for(std::dequeSfxToDo_Impl::const_reverse_iterator i = 
pImp-aToDoStack.rbegin(); i != pImp-aToDoStack.rend(); ++i)
+for(std::dequeSfxToDo_Impl::reverse_iterator i = 
pImp-aToDoStack.rbegin(); i != pImp-aToDoStack.rend(); ++i)
 {
 if(i-bPush)
 aStack.Push(static_castSfxShell*(i-pCluster));
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits