date:20121027

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/933

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/33/933/1

Resolves: fdo#56473 IDE: Crash when inserting a simple macro

Change-Id: I7bb6fe0005b9afa2d853a13a30d5b0c48ba8bdf2
---
M accessibility/source/extended/textwindowaccessibility.cxx
1 file changed, 8 insertions(+), 2 deletions(-)


--
To view, visit https://gerrit.libreoffice.org/933
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7bb6fe0005b9afa2d853a13a30d5b0c48ba8bdf2
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH] Resolves: fdo#56473 IDE: Crash when inserting a simple macro

2012-10-27 Thread julien2412

+ some other changes (sal_Int32 instead of int for i variable + "!=" to
compare current iterator with end iterator instead of "<")

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/PATCH-Resolves-fdo-56473-IDE-Crash-when-inserting-a-simple-macro-tp4015637p4015639.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Resolves: fdo#56473 IDE: Crash when inserting a simple macro

Julien Nabet has abandoned this change.

Change subject: Resolves: fdo#56473 IDE: Crash when inserting a simple macro
..


Patch Set 1: Abandoned

I forgot to replace "m_xParagraphs->begin() + nFirst" by aItBound2

--
To view, visit https://gerrit.libreoffice.org/932
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: abandon
Gerrit-Change-Id: I4390f63ddc491c3bb561cd9a2aea53735bcafb64
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Resolves: fdo#56473 IDE: Crash when inserting a simple macro

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/932

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/32/932/1

Resolves: fdo#56473 IDE: Crash when inserting a simple macro

Change-Id: I4390f63ddc491c3bb561cd9a2aea53735bcafb64
---
M accessibility/source/extended/textwindowaccessibility.cxx
1 file changed, 6 insertions(+), 1 deletion(-)


--
To view, visit https://gerrit.libreoffice.org/932
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4390f63ddc491c3bb561cd9a2aea53735bcafb64
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: RepositoryModule_ooo.mk

 RepositoryModule_ooo.mk |  248 +++-
 1 file changed, 123 insertions(+), 125 deletions(-)

New commits:
commit 8bee0e06b7b142b0cd3a01ebc13f499710ee6319
Author: MatÃºÅ¡ Kukan 
Date:   Sat Oct 27 23:32:04 2012 +0200

tabs vs. spaces cleanup; and use QADEVOOO

Change-Id: I881f9c80accabb1ca1110a6872d12fcf5b5c7f69

diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index ee6f8d9..70eea45 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -29,72 +29,72 @@
 $(eval $(call gb_Module_Module,ooo))
 
 $(eval $(call gb_Module_add_moduledirs,ooo,\
-accessibility \
+   accessibility \
$(call gb_Helper_optional,AFMS,afms) \
-animations \
+   animations \
$(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \
-apple_remote \
-autodoc \
-avmedia \
-basctl \
-basebmp \
-basegfx \
-basic \
-bean \
+   apple_remote \
+   autodoc \
+   avmedia \
+   basctl \
+   basebmp \
+   basegfx \
+   basic \
+   bean \
$(call gb_Helper_optional,BSH,beanshell) \
-binaryurp \
+   binaryurp \
$(call gb_Helper_optional,BLUEZ,bluez_bluetooth) \
boost \
bridges \
-canvas \
-chart2 \
+   canvas \
+   chart2 \
cli_ure \
$(call gb_Helper_optional,CLUCENE,clucene) \
$(call gb_Helper_optional,DESKTOP,codemaker) \
-comphelper \
-configmgr \
-connectivity \
-cosv \
-cppcanvas \
-cppu \
-cppuhelper \
-cpputools \
-$(call gb_Helper_optional,CT2N,ct2n) \
-cui \
-dbaccess \
-desktop \
+   comphelper \
+   configmgr \
+   connectivity \
+   cosv \
+   cppcanvas \
+   cppu \
+   cppuhelper \
+   cpputools \
+   $(call gb_Helper_optional,CT2N,ct2n) \
+   cui \
+   dbaccess \
+   desktop \
$(call gb_Helper_optional,DICTIONARIES,dictionaries) \
-drawinglayer \
-dtrans \
-editeng \
-embeddedobj \
-embedserv \
-eventattacher \
-extensions \
+   drawinglayer \
+   dtrans \
+   editeng \
+   embeddedobj \
+   embedserv \
+   eventattacher \
+   extensions \
extras \
-fileaccess \
-filter \
+   fileaccess \
+   filter \
$(call gb_Helper_optional,FONTCONFIG,fontconfig) \
-forms \
-formula \
-fpicker \
-framework \
+   forms \
+   formula \
+   fpicker \
+   framework \
$(call gb_Helper_optional,FREETYPE,freetype) \
$(call gb_Helper_optional,GRAPHITE,graphite) \
$(call gb_Helper_optional,DESKTOP,helpcompiler) \
$(call gb_Helper_optional,HSQLDB,hsqldb) \
-hwpfilter \
-i18npool \
-i18nutil \
-idl \
+   hwpfilter \
+   i18npool \
+   i18nutil \
+   idl \
$(call gb_Helper_optional,DESKTOP,idlc) \
-io \
-javaunohelper \
+   io \
+   javaunohelper \
$(call gb_Helper_optional,JFREEREPORT,jfreereport) \
-jurt \
-$(call gb_Helper_optional,JPEG,jpeg) \
-jvmaccess \
-jvmfwk \
+   jurt \
+   $(call gb_Helper_optional,JPEG,jpeg) \
+   jvmaccess \
+   jvmfwk \
$(call gb_Helper_optional,DESKTOP,l10ntools) \
$(call gb_Helper_optional,LANGUAGETOOL,languagetool) \
libcdr \
@@ -107,100 +107,98 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
libwpd \
libwpg \
libwps \
-lingucomponent \
-linguistic \
-lotuswordpro \
-MathMLDTD \
+   lingucomponent \
+   linguistic \
+   lotuswordpro \
+   MathMLDTD \
mdds \
-Mesa \
+   Mesa \
$(call gb_Helper_optional,MORE_FONTS,more_fonts) \
$(call gb_Helper_optional,NEON,neon) \
$(call gb_Helper_optional,NLPSOLVER,nlpsolver) \
-np_sdk \
-o3tl \
-offapi \
-officecfg \
-oovbaapi \
-oox \
-package \
-packimages \
-padmin \
-$(call gb_Helper_optional,POSTGRESQL,postgresql) \
-psprint_config \
+   np_sdk \
+   o3tl \
+   offapi \
+   officecfg \
+   oovbaapi \
+   oox \
+   package \
+   packimages \
+   padmin \
+   $(call gb_Helper_optional,POSTGRESQL,postgresql) \
+   psprint_config \
$(call gb_Helper_optional,PYUNO,pyuno) \
-   $(if $(strip $(OOO_JUNIT_JAR)),\
-   qadevOOo \
-   ) \
+   $(call gb_Helper_optional,QADEVOOO,qadevOOo) \
readlicense_oo \
-regexp \
-registry \
-remotebridges \
-reportbuilder \
-reportdesign \
+   regexp \
+   registry \
+   remotebridges \
+   reportbuilder \
+   reportdesign \
$(call gb_Helper_optional,RHINO,rhino) \
-ridljar \
-rsc \
-sal \
-salhelper \
-sane \
-sax \
-sc \
-scaddins \
-sccomp \
+   ridljar \
+   rsc \
+   sal \
+   salhelper \
+   sane \
+   sax

Re: Build of master fails somewhere in the end

2012-10-27 Thread Matúš Kukan

Hi Regina,

On 27 October 2012 19:10, Regina Henschel  wrote:
> Removing src.download was not sufficient. I have deleted the folder
> helpcontent2 and then I got a "checked out
> '50b30c29041679bbf20ee9c4d2b7558b9b84601c'".

ah, nice that it worked in the end

> But the build still do not finish :(
> I've attached the next build_error.log

When in doubt, check http://tinderbox.libreoffice.org/MASTER/status.html
This error was fixed with
http://cgit.freedesktop.org/libreoffice/core/commit/?id=3149d338fc2d766f7e0e974ecf1993b42f32e98d
I think.
It should be safe to pull again now.

All the best,
Matus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Resolves: fdo#38193 WRITER, DRAW: Media Player is missing in...

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/931

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/31/931/1

Resolves: fdo#38193 WRITER, DRAW: Media Player is missing in Tools menu

Change-Id: I0952292ebf1a04743f2bc534c2cfe282b516eedd
---
M sd/uiconfig/sdraw/menubar/menubar.xml
M sw/uiconfig/swriter/menubar/menubar.xml
2 files changed, 2 insertions(+), 0 deletions(-)


--
To view, visit https://gerrit.libreoffice.org/931
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0952292ebf1a04743f2bc534c2cfe282b516eedd
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 37361] LibreOffice 3.5 most annoying bugs

2012-10-27 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=37361

Bug 37361 depends on bug 52392, which changed state.

Bug 52392 Summary: : Bibliography database autofills empty fields with symbols
https://bugs.freedesktop.org/show_bug.cgi?id=52392

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] fix parallelism variables and let's have only one from now o...

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/930

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/30/930/1

fix parallelism variables and let's have only one from now on

Rationale:
- It is advised to use max-jobs and num-cpus with the same value.
- max-jobs was used only for lcms2 and few gbuild
  modules outside of tail_build anyway.

Also fixes:
- Really use CHECK_PARALLELISM when meant to.
- EXTMAXPROCESS is not defined in gbuild, use GMAKE_PARALLELISM.

Change-Id: I501de732d223ce0c935081bd1d73da611d16ee88
---
M Makefile.top
M config_host.mk.in
M configure.ac
M cross_toolset/Makefile
M lcms2/makefile.mk
M libcdr/ExternalProject_libcdr.mk
M librsvg/ExternalProject_librsvg.mk
M libwpd/ExternalProject_libwpd.mk
M postgresql/ExternalProject_postgresql.mk
M solenv/bin/build.pl
M solenv/bin/callcatcher.Makefile
11 files changed, 67 insertions(+), 108 deletions(-)


--
To view, visit https://gerrit.libreoffice.org/930
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I501de732d223ce0c935081bd1d73da611d16ee88
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matúš Kukan 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Windows build failing in instsetoo_native, makecab.exe

2012-10-27 Thread David Ostrovsky


On 27.10.2012 19:29, Jeremy Brown wrote:

After the build ran, although there was an installer at:
instsetoo_native\wntmsci12.pro\LibreOffice_Dev\native\install\en-US\LibO-Dev_3.7.0.0.alpha0_Win_x86_install_en-US.msi
when I tried to install it, it failed with the following error:

Error 1935.An error occurred during the installation of assembly.
'cli_cppuhelper,publicKeyToken="ce2cb7e279207b93",version="1.0.22.0",culture="neutral",processorArchitecture="x86"'.
Please refer to Help and Support for more infor...

It looks like other people are getting that error too though, so maybe
this is as far as I can get until that is resolved...?
(https://bugs.freedesktop.org/show_bug.cgi?id=55290  )
I just updated that issue: you can "borrow" the working 
cli_cppuhelper.dll copy from the last release version and install your 
build.
But it is still not clear why that dll is bigger and broken after 
gbuildification.


Regards
David
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: 3 commits - sw/qa tools/inc unusedcode.easy xmlreader/inc xmlreader/source

 sw/qa/extras/rtfexport/rtfexport.cxx  |2 --
 tools/inc/poly.h  |6 +++---
 tools/inc/tools/date.hxx  |2 +-
 tools/inc/tools/datetime.hxx  |2 +-
 tools/inc/tools/fract.hxx |2 +-
 tools/inc/tools/poly.hxx  |6 +++---
 tools/inc/tools/time.hxx  |2 +-
 tools/inc/tools/unqidx.hxx|2 +-
 unusedcode.easy   |1 -
 xmlreader/inc/xmlreader/xmlreader.hxx |6 --
 xmlreader/source/xmlreader.cxx|   23 ++-
 11 files changed, 13 insertions(+), 41 deletions(-)

New commits:
commit bb90189d7cf45277edb9d907c2468848074652c4
Author: CaolÃ¡n McNamara 
Date:   Sat Oct 27 20:24:49 2012 +0100

sprinkle some more SAL_WARN_UNUSED around

Change-Id: Iaa1508584f005cba6e2ab63d4053cde4ce8637df

diff --git a/tools/inc/poly.h b/tools/inc/poly.h
index e71ba55..a925f9b 100644
--- a/tools/inc/poly.h
+++ b/tools/inc/poly.h
@@ -21,7 +21,7 @@
 
 #include 
 
-class ImplPolygonData
+class SAL_WARN_UNUSED ImplPolygonData
 {
 public:
 Point*  mpPointAry;
@@ -30,7 +30,7 @@ public:
 sal_uIntPtr   mnRefCount;
 };
 
-class ImplPolygon  : public ImplPolygonData
+class SAL_WARN_UNUSED ImplPolygon  : public ImplPolygonData
 {
 public:
 ImplPolygon( sal_uInt16 nInitSize, sal_Bool bFlags = 
sal_False );
@@ -48,7 +48,7 @@ public:
 class Polygon;
 typedef Polygon* SVPPOLYGON;
 
-class ImplPolyPolygon
+class SAL_WARN_UNUSED ImplPolyPolygon
 {
 public:
 SVPPOLYGON* mpPolyAry;
diff --git a/tools/inc/tools/date.hxx b/tools/inc/tools/date.hxx
index dbb40be..42c7c16 100644
--- a/tools/inc/tools/date.hxx
+++ b/tools/inc/tools/date.hxx
@@ -27,7 +27,7 @@ class ResId;
 enum DayOfWeek { MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY,
  SATURDAY, SUNDAY };
 
-class TOOLS_DLLPUBLIC Date
+class TOOLS_DLLPUBLIC SAL_WARN_UNUSED Date
 {
 private:
 sal_uInt32  nDate;
diff --git a/tools/inc/tools/datetime.hxx b/tools/inc/tools/datetime.hxx
index 5d40dfe..0a79934 100644
--- a/tools/inc/tools/datetime.hxx
+++ b/tools/inc/tools/datetime.hxx
@@ -24,7 +24,7 @@
 #include 
 #include 
 
-class TOOLS_DLLPUBLIC DateTime : public Date, public Time
+class TOOLS_DLLPUBLIC SAL_WARN_UNUSED DateTime : public Date, public Time
 {
 public:
 enum DateTimeInitSystem
diff --git a/tools/inc/tools/fract.hxx b/tools/inc/tools/fract.hxx
index 0bf04b2..24c6721 100644
--- a/tools/inc/tools/fract.hxx
+++ b/tools/inc/tools/fract.hxx
@@ -24,7 +24,7 @@
 
 class SvStream;
 
-class TOOLS_DLLPUBLIC Fraction
+class TOOLS_DLLPUBLIC SAL_WARN_UNUSED Fraction
 {
 private:
 longnNumerator;
diff --git a/tools/inc/tools/poly.hxx b/tools/inc/tools/poly.hxx
index 8eb095e..fc6c57e 100644
--- a/tools/inc/tools/poly.hxx
+++ b/tools/inc/tools/poly.hxx
@@ -53,7 +53,7 @@ enum PolyFlags
 };
 #endif
 
-class PolyOptimizeData
+class SAL_WARN_UNUSED PolyOptimizeData
 {
 private:
 
@@ -81,7 +81,7 @@ namespace basegfx
 class B2DPolyPolygon;
 }
 
-class TOOLS_DLLPUBLIC Polygon
+class TOOLS_DLLPUBLIC SAL_WARN_UNUSED Polygon
 {
 private:
 ImplPolygon*mpImplPolygon;
@@ -194,7 +194,7 @@ public:
 explicit Polygon(const ::basegfx::B2DPolygon& rPolygon);
 };
 
-class TOOLS_DLLPUBLIC PolyPolygon
+class TOOLS_DLLPUBLIC SAL_WARN_UNUSED PolyPolygon
 {
 private:
 ImplPolyPolygon*mpImplPolyPolygon;
diff --git a/tools/inc/tools/time.hxx b/tools/inc/tools/time.hxx
index 05c6d1e..fe58510 100644
--- a/tools/inc/tools/time.hxx
+++ b/tools/inc/tools/time.hxx
@@ -30,7 +30,7 @@ class ResId;
25 hours or 10 minus 20 seconds being (non-negative) 10 seconds.
 */
 
-class TOOLS_DLLPUBLIC Time
+class TOOLS_DLLPUBLIC SAL_WARN_UNUSED Time
 {
 private:
 sal_Int32   nTime;
diff --git a/tools/inc/tools/unqidx.hxx b/tools/inc/tools/unqidx.hxx
index 18088ef..3a3ba97 100644
--- a/tools/inc/tools/unqidx.hxx
+++ b/tools/inc/tools/unqidx.hxx
@@ -26,7 +26,7 @@
 
 #define UNIQUEINDEX_ENTRY_NOTFOUND   CONTAINER_ENTRY_NOTFOUND
 
-class TOOLS_DLLPUBLIC UniqueIndexImpl : public std::map
+class TOOLS_DLLPUBLIC SAL_WARN_UNUSED UniqueIndexImpl : public 
std::map
 {
 private:
 sal_uIntPtr   nStartIndex;
commit 2914d52fdf6ef3b672190ccbb2c8be5a6760187e
Author: CaolÃ¡n McNamara 
Date:   Sat Oct 27 20:16:33 2012 +0100

remove xmlreader from string now I don't need it anymore

Change-Id: I8d280a5fa352bf4514a5e593b34be767648f4e64

diff --git a/unusedcode.easy b/unusedcode.easy
index bb758da..3ebbdd6 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -80,7 +80,6 @@ 
comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptr
 const&, rtl::OUString const&, com::sun::star::uno::Any const&) const
 connectivity::file::OStatement_Base::reset()
-connectivity::mork::MQueryHelper::next()
 connectivity::mork::MQueryHelperResultEntry::insert(rtl::OString const&, 
rtl::OUString&)
 connectivity::mork::OColumnAlias::OColumnAlias()
 connecti

where to put icons for the iconset feature?

2012-10-27 Thread Markus Mohrhard

Hey,

I'm currently implementing the icon set support and have no idea where
to put the icons. There will be around 50 to 60 icons if we want full
compatibility with OOXML.

Should they really be put into the galaxy icon set even if they are
only used in calc core and are not related to the UI code?

Regards,
Markus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: boost/boost_1_44_0-clang-warnings.patch

 boost/boost_1_44_0-clang-warnings.patch |  203 
 1 file changed, 203 deletions(-)

New commits:
commit bce37dbd616bb21d81a7e49ee3b8f8a3903e82f5
Author: Peter Foley 
Date:   Sat Oct 27 13:43:54 2012 -0400

fix linking on windows

Change-Id: Ibd2fe3cf8775cbda51f768ceaeb92b66a91c3850

diff --git a/boost/boost_1_44_0-clang-warnings.patch 
b/boost/boost_1_44_0-clang-warnings.patch
index b9249c0..ed81ce5 100644
--- a/boost/boost_1_44_0-clang-warnings.patch
+++ b/boost/boost_1_44_0-clang-warnings.patch
@@ -69,209 +69,6 @@
  {
m_period_separator;
m_period_start_delimeter;
 misc/boost_1_44_0/boost/multi_array/multi_array_ref.hpp
-+++ misc/build/boost_1_44_0/boost/multi_array/multi_array_ref.hpp
-@@ -86,24 +86,24 @@ public:
-   num_elements_(other.num_elements_)  {  }
- 
-   template 
--  explicit const_multi_array_ref(TPtr base, const ExtentList& extents) :
-+  explicit const_multi_array_ref(TPtr base, const ExtentList& extentlist) :
- base_(base), storage_(c_storage_order()) {
- boost::function_requires<
-   detail::multi_array::CollectionConcept >();
- 
- index_base_list_.assign(0);
--init_multi_array_ref(extents.begin());
-+init_multi_array_ref(extentlist.begin());
-   }
-   
-   template 
--  explicit const_multi_array_ref(TPtr base, const ExtentList& extents,
-+  explicit const_multi_array_ref(TPtr base, const ExtentList& extentlist,
-const general_storage_order& so) : 
- base_(base), storage_(so) {
- boost::function_requires<
-   detail::multi_array::CollectionConcept >();
- 
- index_base_list_.assign(0);
--init_multi_array_ref(extents.begin());
-+init_multi_array_ref(extentlist.begin());
-   }
-   
-   explicit const_multi_array_ref(TPtr base,
-@@ -161,14 +161,14 @@ public:
-   }
- 
-   template 
--  void reshape(const SizeList& extents) {
-+  void reshape(const SizeList& extentlist) {
- boost::function_requires<
-   detail::multi_array::CollectionConcept >();
- BOOST_ASSERT(num_elements_ ==
-- std::accumulate(extents.begin(),extents.end(),
-+ std::accumulate(extentlist.begin(),extentlist.end(),
-  size_type(1),std::multiplies()));
- 
--std::copy(extents.begin(),extents.end(),extent_list_.begin());
-+std::copy(extentlist.begin(),extentlist.end(),extent_list_.begin());
- this->compute_strides(stride_list_,extent_list_,storage_);
- 
- origin_offset_ =
-@@ -208,11 +208,11 @@ public:
-   }
- 
-   template 
--  const element& operator()(IndexList indices) const {
-+  const element& operator()(IndexList indexlist) const {
- boost::function_requires<
-   detail::multi_array::CollectionConcept >();
- return super_type::access_element(boost::type(),
--  indices,origin(),
-+  indexlist,origin(),
-   shape(),strides(),index_bases());
-   }
- 
-@@ -231,12 +231,12 @@ public:
- #endif // BOOST_MSVC
-   typename const_array_view::type 
-   operator[](const detail::multi_array::
-- index_gen& indices)
-+ index_gen& indexlist)
- const {
- typedef typename const_array_view::type return_type;
- return
-   super_type::generate_array_view(boost::type(),
--  indices,
-+  indexlist,
-   shape(),
-   strides(),
-   index_bases(),
-@@ -328,10 +328,10 @@ public:
-   const_multi_array_ref(TPtr base,
- const storage_order_type& so,
- const index * index_bases_,
--const size_type* extents) :
-+const size_type* extentlist) :
- base_(base), storage_(so), origin_offset_(0), directional_offset_(0)
-  {
--   // If index_bases_ or extents is null, then initialize the corresponding
-+   // If index_bases_ or extentlist is null, then initialize the corresponding
-// private data to zeroed lists.
-if(index_bases_) {
-  boost::detail::multi_array::
-@@ -339,8 +339,8 @@ public:
-} else {
-  std::fill_n(index_base_list_.begin(),NumDims,0);
-}
--   if(extents) {
-- init_multi_array_ref(extents);
-+   if(extentlist) {
-+ init_multi_array_ref(extentlist);
-} else {
-  boost::array extent_list;
-  extent_list.assign(0);
-@@ -374,12 +374,12 @@ private:
-   boost::mem_fun_ref(&extent_range::start));
- 
- // calculate the extents
--extent_list extents;
-+extent_list extentlist;
- std::transform(ranges.ranges_.begin(),ranges.ranges_.end(),
--  extents.begin(),
-+  extentlist.begin(),
-   boost::mem_fun_ref(&extent_range::size));
- 
--init_multi_array_ref(extents.begin());
-+init

[PATCH] ::rtl::OUString -> OUString in basegfx

2012-10-27 Thread Ricardo Montania (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/929

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/29/929/1

::rtl::OUString -> OUString in basegfx

Change-Id: I2e0189135d5f30b20e625b849cedbef2eb639ed9
---
M basegfx/source/polygon/b2dsvgpolypolygon.cxx
M basegfx/source/tools/canvastools.cxx
M basegfx/source/tools/unopolypolygon.cxx
3 files changed, 36 insertions(+), 38 deletions(-)


--
To view, visit https://gerrit.libreoffice.org/929
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e0189135d5f30b20e625b849cedbef2eb639ed9
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ricardo Montania 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] ::rtl::OUString -> OUString in basebmp

2012-10-27 Thread Ricardo Montania (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/928

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/28/928/1

::rtl::OUString -> OUString in basebmp

Change-Id: Id9cde5559165c61da825938153e92df999233a59
---
M basebmp/test/bmpdemo.cxx
M basebmp/test/bmpmasktest.cxx
M basebmp/test/bmptest.cxx
M basebmp/test/cliptest.cxx
M basebmp/test/filltest.cxx
M basebmp/test/masktest.cxx
M basebmp/test/polytest.cxx
7 files changed, 24 insertions(+), 25 deletions(-)


--
To view, visit https://gerrit.libreoffice.org/928
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id9cde5559165c61da825938153e92df999233a59
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ricardo Montania 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Windows build failing in instsetoo_native, makecab.exe

2012-10-27 Thread Jeremy Brown

I found the files it is complaining about under /tmp/ooopackaing/...

The problem is that it is creating files with no permissions. e.g.
D:\Dev\cygwin\tmp\ooopackaging\i_106601351284799\wntmsci12.pro\LibreOffice_Dev\native\zip\en-US\00\basicsrvdepot_zip\CommonLang.xba
has no read/write/execute permissions set for anyone.

I opened a second Cygwin window and cd'd to /tmp. When the build got
to the part right before it executes makecab.exe in the first windows,
I had the second cygwin window execute:
chmod -R a=rwx ooopackaging

After that, the build process finished and said it was successful.

Is there some reason this would be happening for me? Other people seem
to be making Windows builds without this problem, right?

After the build ran, although there was an installer at:
instsetoo_native\wntmsci12.pro\LibreOffice_Dev\native\install\en-US\LibO-Dev_3.7.0.0.alpha0_Win_x86_install_en-US.msi
when I tried to install it, it failed with the following error:

Error 1935.An error occurred during the installation of assembly.
'cli_cppuhelper,publicKeyToken="ce2cb7e279207b93",version="1.0.22.0",culture="neutral",processorArchitecture="x86"'.
Please refer to Help and Support for more infor...

It looks like other people are getting that error too though, so maybe
this is as far as I can get until that is resolved...?
( https://bugs.freedesktop.org/show_bug.cgi?id=55290 )
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[ANN] LibreOffice 3.6.3 RC2 available

2012-10-27 Thread Thorsten Behrens

Dear Community,

The Document Foundation is happy to announce the second release
candidate of LibreOffice 3.6.3. The upcoming 3.6.3 will be the third
in a series of frequent bugfix releases, for our feature-packed 3.6
branch. Please be aware that LibreOffice 3.6.3 RC2 is not ready for
production use, you should continue to use LibreOffice 3.6.2 for that.

The release is available for Windows, Linux and Mac OS X from our QA
builds download page at

  http://www.libreoffice.org/download/pre-releases/

Should you find bugs, please report them to the FreeDesktop Bugzilla:

  https://bugs.freedesktop.org

A good way to assess the release candidate quality is to run some
specific manual tests on it, our TCM wiki page has more details:

 
http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test

 (and the announcement mail: 
http://lists.freedesktop.org/archives/libreoffice/2011-December/022464.html)
 
For other ways to get involved with this exciting project - you can
e.g. contribute code:

  http://www.libreoffice.org/get-involved/developers/

translate LibreOffice to your language:

  http://wiki.documentfoundation.org/Translation_for_3.5

or help with funding our operations:

  http://donate.libreoffice.org/

A list of known issues and fixed bugs with 3.6.3 RC2 is available
from our wiki:

  http://wiki.documentfoundation.org/Releases/3.6.3/RC2

If no showstopper bugs are found, this 3.6.3 RC2 is slated to become
3.6.3 final - see our release schedule for that branch:

 http://wiki.documentfoundation.org/ReleasePlan/3.6#3.6.3_release

Let us close again with a BIG Thank You! to all of you having
contributed to the LibreOffice project - this release would not have
been possible without your help.

Yours,

The Document Foundation Board of Directors

The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany
Rechtsfähige Stiftung des bürgerlichen Rechts
Legal details: http://www.documentfoundation.org/imprint



pgpfn0a68FKd9.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Adjusting an Array Range in Calc

2012-10-27 Thread Lars Callenbach

Hi Eike,

attached you will find the code which does not work (as I expected). 

The code copies input integer values and adds 10. If you define it as 
a matrix result it is not possible to change the size of the array range 
afterwards (e.g. to extend the input data). 

Regards,
   Lars


P.S.: sorry for my late answer. I have not seen yours since it is a new 
thread in the mailing list archive.


 Original-Nachricht 
> Datum: Fri, 5 Oct 2012 17:55:40 +0200
> Von: Eike Rathke 
> An: Lars Callenbach 
> CC: libreoffice@lists.freedesktop.org, Jan Holesovsky 
> Betreff: Re: Adjusting an Array Range in Calc

> Hi Lars,
> 
> On Friday, 2012-09-21 23:10:22 +0200, Lars Callenbach wrote:
> 
> > I have a plugin with an C++ addin code of the following form
> 
> I would take a look if you could you send me a minimal code sample and
> makefile needed to build a working Add-In to reproduce your case?
> 
>   Eike
> 
> -- 
> LibreOffice Calc developer. Number formatter stricken i18n
> transpositionizer.
> GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD
> Support the FSFE, care about Free Software!
> https://fsfe.org/support/?erack


small.tgz
Description: application/compressed-tar
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Build of master fails somewhere in the end

2012-10-27 Thread Regina Henschel


Hi all,

Matúš Kukan schrieb:

Hi Regina,

On 27 October 2012 13:06, Regina Henschel  wrote:

I find error message in the fetch log:
Cloning into helpcontent2...
fatal: reference is not a tree: 2cc7764943882fa89e31c96f6e0467c96bda3976
Unable to checkout '2cc7764943882fa89e31c96f6e0467c96bda3976' in submodule
path 'helpcontent2'


It seems you are between af8d133ea0698ce7a163664e061d9ed33fb358c6 and
9ffc1f4e03d1477eaa29873267161e7697c55d3f
The latter just reverts the first one.
So, either revert af8d133ea0698ce7a163664e061d9ed33fb358c6 or ./g pull -r



I did git pull.




Trying 'make fetch' again gives only:
make[1]: Nothing to be done for `fetch'.

How to get helpcontent2 afterwards?


rm src.downloaded
and then make fetch


Removing src.download was not sufficient. I have deleted the folder 
helpcontent2 and then I got a "checked out 
'50b30c29041679bbf20ee9c4d2b7558b9b84601c'".


But the build still do not finish :(
I've attached the next build_error.log

Kind regards
Regina
log for /cygdrive/c/git/LO37Nov/tail_build/prj
/cygdrive/c/git/LO37Nov/pyuno/Library_pyuno.mk:27: warning: overriding recipe for target `C:/git/LO37Nov/workdir/wntmsci12/LinkTarget/Library/pyuno.pyd'
/cygdrive/c/git/LO37Nov/pyuno/Library_pyuno.mk:27: warning: ignoring old recipe for target `C:/git/LO37Nov/workdir/wntmsci12/LinkTarget/Library/pyuno.pyd'
[build DEP] LNK:Library/iwriterfilter.lib
[build DEP] LNK:Library/irptui.lib
/cygdrive/c/git/LO37Nov/pyuno/Library_pyuno.mk:27: warning: overriding recipe for target `C:/git/LO37Nov/workdir/wntmsci12/LinkTarget/Library/pyuno.pyd'
/cygdrive/c/git/LO37Nov/pyuno/Library_pyuno.mk:27: warning: ignoring old recipe for target `C:/git/LO37Nov/workdir/wntmsci12/LinkTarget/Library/pyuno.pyd'
[build SCT] scp2/source/templates/alllangmodules_accessories_samples
[build SCT] scp2/source/templates/alllangmodules_accessories_samples_root
[build SCT] scp2/source/templates/alllangmodules_accessories_templates
[build SCT] scp2/source/templates/alllangmodules_accessories_templates_root
[build SCT] scp2/source/templates/alllangmodules_base
[build SCT] scp2/source/templates/alllangmodules_calc
[build SCT] scp2/source/templates/alllangmodules_draw
[build SCT] scp2/source/templates/alllangmodules_extensions_templates
[build SCT] scp2/source/templates/alllangmodules_impress
[build SCT] scp2/source/templates/alllangmodules_math
[build SCT] scp2/source/templates/allhelpmodules
[build SCT] scp2/source/templates/allhelpmodules_root
[build SCT] scp2/source/templates/alllangmodules
[build SCT] scp2/source/templates/alllangmodules_root
[build SCT] scp2/source/templates/alllangmodules_writer
[build CHK] scp2
[build SLC] scp2
[build MOD] clucene
[build MOD] librsvg
[build MOD] neon
[build SCC] scp2/source/accessories/module_accessories
[build SCC] scp2/source/accessories/module_font_accessories
[build SCC] scp2/source/accessories/module_gallery_accessories
[build SCC] scp2/source/accessories/module_samples_accessories
[build SCC] scp2/source/accessories/module_templates_accessories
[build SCC] scp2/source/base/module_base
[build SCC] scp2/source/base/postgresqlsdbc
[build SCC] scp2/source/calc/module_calc
[build SCC] scp2/source/draw/module_draw
[build SCC] scp2/source/extensions/module_extensions
[build SCC] scp2/source/extensions/module_extensions_sun_templates
[build SCC] scp2/source/graphicfilter/module_graphicfilter
[build SCC] scp2/source/impress/module_impress
[build SCC] scp2/source/math/module_math
[build SCC] scp2/source/onlineupdate/module_onlineupdate
[build SCC] scp2/source/ooo/module_helppack
[build SCC] scp2/source/ooo/module_langpack
[build SCC] scp2/source/ooo/module_ooo
[build SCC] scp2/source/ooo/module_systemint
[build SCC] scp2/source/python/module_python
[build SCC] scp2/source/python/module_python_mailmerge
[build SCC] scp2/source/writer/module_writer
[build SCC] scp2/source/xsltfilter/module_xsltfilter
[build SCC] scp2/source/activex/module_activex
[build SCC] scp2/source/quickstart/module_quickstart
[build SCC] scp2/source/base/folderitem_base
[build SCC] scp2/source/base/registryitem_base
[build SCC] scp2/source/calc/folderitem_calc
[build SCC] scp2/source/calc/registryitem_calc
[build SCC] scp2/source/draw/folderitem_draw
[build SCC] scp2/source/draw/registryitem_draw
[build SCC] scp2/source/impress/folderitem_impress
[build SCC] scp2/source/impress/registryitem_impress
[build SCC] scp2/source/math/folderitem_math
[build SCC] scp2/source/math/registryitem_math
[build SCC] scp2/source/ooo/folderitem_ooo
[build SCC] scp2/source/ooo/registryitem_ooo
[build SCC] scp2/source/writer/folderitem_writer
[build SCC] scp2/source/writer/registryitem_writer
[build SCC] scp2/source/winexplorerext/module_winexplorerext
[build SCC] scp2/source/gnome/module_gnome
[build SCC] scp2/source/javafilter/module_javafilter
[build SCC] scp2/source/javafilter/registryitem_javafilter
[build CUT] binaryurp_test-cache
[build CUT] o3tl_tests
[build CUT] Module_DLL
[build CUT] sal_bytesequence
[build CUT] sal_checkapi
[b

[PATCH] fdo#55430 allow clicking objects in front of selected ones

2012-10-27 Thread Lennard Wasserthal (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/927

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/27/927/1

fdo#55430 allow clicking objects in front of selected ones

Prevents that selected objects shadow selecting others in front of them.

Change-Id: Iee4abf4eddf79ef7ed331221b0a0b23d3370ae2b
Signed-off-by: Lennard 
---
M sd/source/ui/func/fusel.cxx
M svx/inc/svx/svdmrkv.hxx
M svx/source/svdraw/svdmrkv.cxx
3 files changed, 32 insertions(+), 2 deletions(-)


--
To view, visit https://gerrit.libreoffice.org/927
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee4abf4eddf79ef7ed331221b0a0b23d3370ae2b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Lennard Wasserthal 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 54157] LibreOffice 3.7 most annoying bugs

2012-10-27 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=54157

Korrawit Pruegsanusak  changed:

   What|Removed |Added

 Depends on||55563, 53525

--- Comment #19 from Korrawit Pruegsanusak  ---
Adding 2 master regressions. Both have been git bisected and first bad commit
identified.

1. Bug #55563 - FILEOPEN PPTX image background rendered incorrectly. Currently
reproducible in Windows, but not Linux. (No Mac to test)

2. Bug #53525 - FILEOPEN existing document: 2 columns Table of contents exceeds
page width. Affect both Windows and Linux.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] OUString cleanup finished in basctl

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/925

Approvals:
  Caolán McNamara: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/925
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6d18f5cde7866828ca95ccff702eb86d2e40c58d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ricardo Montania 
Gerrit-Reviewer: Caolán McNamara 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: basctl/source

 basctl/source/inc/dlgeddef.hxx|   30 +++---
 basctl/source/inc/localizationmgr.hxx |   22 +++---
 basctl/source/inc/managelang.hxx  |   10 +-
 basctl/source/inc/propbrw.hxx |2 +-
 basctl/source/inc/sbxitem.hxx |   16 
 5 files changed, 40 insertions(+), 40 deletions(-)

New commits:
commit b596ce9bb1feafe5c09fa87582d96acceb6ae37d
Author: Ricardo Montania 
Date:   Fri Oct 26 23:35:24 2012 -0200

OUString cleanup finished in basctl

Change-Id: I6d18f5cde7866828ca95ccff702eb86d2e40c58d
Reviewed-on: https://gerrit.libreoffice.org/925
Tested-by: CaolÃ¡n McNamara 
Reviewed-by: CaolÃ¡n McNamara 

diff --git a/basctl/source/inc/dlgeddef.hxx b/basctl/source/inc/dlgeddef.hxx
index 16fb33e..ec06d6c 100644
--- a/basctl/source/inc/dlgeddef.hxx
+++ b/basctl/source/inc/dlgeddef.hxx
@@ -68,21 +68,21 @@ enum
 };
 
 // control properties
-#define DLGED_PROP_BACKGROUNDCOLOR   rtl::OUString("BackgroundColor")
-#define DLGED_PROP_DROPDOWN  rtl::OUString("Dropdown")
-#define DLGED_PROP_FORMATSSUPPLIER   rtl::OUString("FormatsSupplier")
-#define DLGED_PROP_HEIGHTrtl::OUString("Height")
-#define DLGED_PROP_LABEL rtl::OUString("Label")
-#define DLGED_PROP_NAME  rtl::OUString("Name")
-#define DLGED_PROP_ORIENTATION   rtl::OUString("Orientation")
-#define DLGED_PROP_POSITIONX rtl::OUString("PositionX")
-#define DLGED_PROP_POSITIONY rtl::OUString("PositionY")
-#define DLGED_PROP_STEP  rtl::OUString("Step")
-#define DLGED_PROP_TABINDEX  rtl::OUString("TabIndex")
-#define DLGED_PROP_TEXTCOLOR rtl::OUString("TextColor")
-#define DLGED_PROP_TEXTLINECOLOR rtl::OUString("TextLineColor")
-#define DLGED_PROP_WIDTH rtl::OUString("Width")
-#define DLGED_PROP_DECORATIONrtl::OUString("Decoration")
+#define DLGED_PROP_BACKGROUNDCOLOR   "BackgroundColor"
+#define DLGED_PROP_DROPDOWN  "Dropdown"
+#define DLGED_PROP_FORMATSSUPPLIER   "FormatsSupplier"
+#define DLGED_PROP_HEIGHT"Height"
+#define DLGED_PROP_LABEL "Label"
+#define DLGED_PROP_NAME  "Name"
+#define DLGED_PROP_ORIENTATION   "Orientation"
+#define DLGED_PROP_POSITIONX "PositionX"
+#define DLGED_PROP_POSITIONY "PositionY"
+#define DLGED_PROP_STEP  "Step"
+#define DLGED_PROP_TABINDEX  "TabIndex"
+#define DLGED_PROP_TEXTCOLOR "TextColor"
+#define DLGED_PROP_TEXTLINECOLOR "TextLineColor"
+#define DLGED_PROP_WIDTH "Width"
+#define DLGED_PROP_DECORATION"Decoration"
 
 
 } // namespace basctl
diff --git a/basctl/source/inc/localizationmgr.hxx 
b/basctl/source/inc/localizationmgr.hxx
index e3da88b..de471a3 100644
--- a/basctl/source/inc/localizationmgr.hxx
+++ b/basctl/source/inc/localizationmgr.hxx
@@ -38,7 +38,7 @@ class LocalizationMgr
 Shell*  m_pShell;
 
 ScriptDocument  m_aDocument;
-::rtl::OUString m_aLibName;
+OUStringm_aLibName;
 
 ::com::sun::star::lang::Locale  
m_aLocaleBeforeBasicStart;
 
@@ -53,7 +53,7 @@ class LocalizationMgr
 COPY_RESOURCES
 };
 static sal_Int32 implHandleControlResourceProperties( 
::com::sun::star::uno::Any aControlAny,
-const ::rtl::OUString& aDialogName, const ::rtl::OUString& 
aCtrlName,
+const OUString& aDialogName, const OUString& aCtrlName,
 ::com::sun::star::uno::Reference< 
::com::sun::star::resource::XStringResourceManager >
 xStringResourceManager, ::com::sun::star::uno::Reference< 
::com::sun::star::resource::
 XStringResourceResolver > xSourceStringResolver, 
HandleResourceMode eMode );
@@ -69,7 +69,7 @@ class LocalizationMgr
 void implEnableDisableResourceForAllLibraryDialogs( HandleResourceMode 
eMode );
 
 public:
-LocalizationMgr(Shell*, ScriptDocument const&, rtl::OUString const& 
aLibName,
+LocalizationMgr(Shell*, ScriptDocument const&, OUString const& aLibName,
 const ::com::sun::star::uno::Reference
 < ::com::sun::star::resource::XStringResourceManager >& 
xStringResourceManager );
 ::com::sun::star::uno::Reference
@@ -97,21 +97,21 @@ public:
 void handleBasicStopped( void );
 
 static void setControlResourceIDsForNewEditorObject( DlgEditor* pEditor,
-::com::sun::star::uno::Any aControlAny, const ::rtl::OUString& 
aCtrlName );
+::com::sun::star::uno::Any aControlAny, const OUString& aCtrlName );
 
 static void renameControlResourceIDsForEditorObject( DlgEditor* pEditor,
-::com::sun::star::uno::Any aControlAny, const ::rtl::OUString& 
aNewCtrlName );
+::com::sun::star::uno::Any aControlAny, const OUString& aNe

[PUSHED] OUString cleanup and some identation

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/924

Approvals:
  Caolán McNamara: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/924
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id222047750b7527e35977b73213ceeb12a53b57a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ricardo Montania 
Gerrit-Reviewer: Caolán McNamara 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: basctl/source

 basctl/source/inc/basobj.hxx |   40 ++---
 basctl/source/inc/scriptdocument.hxx |   66 ---
 2 files changed, 51 insertions(+), 55 deletions(-)

New commits:
commit fe6913b9687cb80a821e103e2756a6ada08a0b3a
Author: Ricardo Montania 
Date:   Fri Oct 26 22:41:53 2012 -0200

OUString cleanup and some identation

Change-Id: Id222047750b7527e35977b73213ceeb12a53b57a
Reviewed-on: https://gerrit.libreoffice.org/924
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/basctl/source/inc/basobj.hxx b/basctl/source/inc/basobj.hxx
index 16481f7..99bd6b0 100644
--- a/basctl/source/inc/basobj.hxx
+++ b/basctl/source/inc/basobj.hxx
@@ -39,28 +39,28 @@ namespace basctl
 
 
 // help methods for the general use:
-SbMethod*   CreateMacro( SbModule* pModule, const String& rMacroName );
+SbMethod*   CreateMacro( SbModule* pModule, const String& rMacroName );
 voidRunMethod( SbMethod* pMethod );
 
-StarBASIC*  FindBasic( const SbxVariable* pVar );
+StarBASIC*  FindBasic( const SbxVariable* pVar );
 voidStopBasic();
-long HandleBasicError( StarBASIC* pBasic );
+longHandleBasicError( StarBASIC* pBasic );
 voidBasicStopped( bool* pbAppWindowDisabled = 0, bool* 
pbDispatcherLocked = 0, sal_uInt16* pnWaitCount = 0,
 SfxUInt16Item** ppSWActionCount = 0, 
SfxUInt16Item** ppSWLockViewCount = 0 );
 
 boolIsValidSbxName( const String& rName );
 
-BasicManager*   FindBasicManager( StarBASIC* pLib );
+BasicManager*   FindBasicManager( StarBASIC* pLib );
 
-SfxBindings*GetBindingsPtr();
+SfxBindings*GetBindingsPtr();
 
-SfxDispatcher*  GetDispatcher ();
+SfxDispatcher*  GetDispatcher ();
 
 voidInvalidateDebuggerSlots();
 
 // libraries
 
-::com::sun::star::uno::Sequence< ::rtl::OUString > GetMergedLibraryNames(
+::com::sun::star::uno::Sequence< OUString > GetMergedLibraryNames(
 const ::com::sun::star::uno::Reference< 
::com::sun::star::script::XLibraryContainer >& xModLibContainer,
 const ::com::sun::star::uno::Reference< 
::com::sun::star::script::XLibraryContainer >& xDlgLibContainer );
 
@@ -68,21 +68,22 @@ namespace basctl
 
 Will show an error message when renaming fails because the new name is 
already used.
 */
-bool RenameModule(
+boolRenameModule(
 Window* pErrorParent, const ScriptDocument& rDocument,
-const ::rtl::OUString& rLibName, const ::rtl::OUString& rOldName, 
const ::rtl::OUString& rNewName );
+const OUString& rLibName, const OUString& rOldName, const OUString& 
rNewName );
 
 // new methods for macros
 
-::rtl::OUString ChooseMacro( const ::com::sun::star::uno::Reference< 
::com::sun::star::frame::XModel >& rxLimitToDocument,
-bool bChooseOnly, const ::rtl::OUString& rMacroDesc );
+OUStringChooseMacro(
+const ::com::sun::star::uno::Reference< 
::com::sun::star::frame::XModel >& rxLimitToDocument,
+bool bChooseOnly, const OUString& rMacroDesc );
 
-::com::sun::star::uno::Sequence< ::rtl::OUString > GetMethodNames(
-const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, 
const ::rtl::OUString& rModName )
+::com::sun::star::uno::Sequence< OUString > GetMethodNames(
+const ScriptDocument& rDocument, const OUString& rLibName, const 
OUString& rModName )
 throw( ::com::sun::star::container::NoSuchElementException );
 
-boolHasMethod(
-const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, 
const ::rtl::OUString& rModName, const ::rtl::OUString& rMethName );
+boolHasMethod(
+const ScriptDocument& rDocument, const OUString& rLibName, const 
OUString& rModName, const OUString& rMethName );
 
 // new methods for dialogs
 
@@ -90,14 +91,13 @@ namespace basctl
 
 Will show an error message when renaming fails because the new name is 
already used.
 */
-bool RenameDialog(
-Window* pErrorParent, const ScriptDocument& rDocument, const 
::rtl::OUString& rLibName, const ::rtl::OUString& rOldName, const 
::rtl::OUString& rNewName )
+boolRenameDialog(
+Window* pErrorParent, const ScriptDocument& rDocument, const OUString& 
rLibName, const OUString& rOldName, const OUString& rNewName )
 throw( ::com::sun::star::container::ElementExistException, 
::com::sun::star::container::NoSuchElementException );
 
-bool RemoveDialog(
-const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, 
const ::rtl::OUString& rDlgName );
+boolRemoveDialog( const ScriptDocument& rDocument, const 
OUString& rLibName, const OUString& rDlgName );
 
-voidMarkDocument

[PUSHED] Change in core[libreoffice-3-6]: fdo#49517: Revert "fdo#46102: Load Java scripts with class l...

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/922

Approvals:
  Caolán McNamara: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/922
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I31cd16b3720ffeb1058722d4d1fdffb773f8a067
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Stephan Bergmann 
Gerrit-Reviewer: Caolán McNamara 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - scripting/java

 scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java 
   |   46 --
 scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java  
   |6 -
 
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
 |3 
 
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
   |3 
 
scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
 |2 
 
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
 |3 
 6 files changed, 9 insertions(+), 54 deletions(-)

New commits:
commit 2f42a6cdb63ef8471c1ed54bea3a232272474182
Author: Stephan Bergmann 
Date:   Fri Oct 26 16:22:16 2012 +0200

fdo#49517: Revert "fdo#46102: Load Java scripts with class loaders [...]"

This reverts commit dd6c4f4db1d62268d73e09ae52d23f760a967dcc "fdo#46102: 
Load
Java scripts with class loaders that actually find them."  That commit broke
support for macros embedded in documents (as
new java.net.URL("vnd.sun.star.tdoc:...") throws a MalformedURLExcetpion), 
and
it looks like that commit was not necessary after all -- or rather that 
what it
tried to work around must have been some other problem that has been fixed
meanwhile.  "It is unclear to me how the Java script provider shall ever 
have
found the script jars in the past" indicates that something must have been
fishy, and what I failed to notice back then is that createURL creates
java.net.URL instances with a UCBStreamHandler that does allow to obtain 
content
from weird-looking URLs.

Anyway, with that reverted, all three following scenarios work on both 
current
master (towards LO 3.7) and libreoffice-3-6 (towards LO 3.6.4); I haven't 
yet
come around to test on libreoffice-3-5:

1  Stock macros, "Tools - Macros - Run Macro... - LibreOffice Macros -
HelloWorld", running all of the four "helloworld.bsh", "helloworld.js",
"HelloWorldPyhton", and
"org.libreoffice.example.java_scripts.HelloWorld.printHW".

2  Per-document macros, loading test.odt attached to fdo#49517, then "Tools 
-
Macros - Run Macro... - test.odt - HelloWorld", running
"org.libreoffice.example.java_scripts.HelloWorld.printHW".

3  Extension macros, installing ScriptDispatch.oxt attached to fdo#46012 as
shared extension, then loading StartScriptDispatch.odt attached to 
fdo#46012 and
pressing the "Start Java via ScriptProvider" button.

Change-Id: I31cd16b3720ffeb1058722d4d1fdffb773f8a067
(cherry picked from commit 7ea7fb009ddcfb0723e88ba0c5778b5fdbe2b553)
Reviewed-on: https://gerrit.libreoffice.org/922
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git 
a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java 
b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
index 178f480..1cf99d7 100644
--- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
@@ -50,14 +50,7 @@ import com.sun.star.script.framework.io.UCBStreamHandler;
 
 import com.sun.star.ucb.XSimpleFileAccess2;
 
-import com.sun.star.uno.AnyConverter;
 import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XComponentContext;
-
-import com.sun.star.uri.UriReferenceFactory;
-import com.sun.star.uri.XVndSunStarExpandUrl;
-
-import com.sun.star.util.XMacroExpander;
 
 public class ScriptMetaData extends ScriptEntry implements Cloneable {
 private boolean hasSource = false;
@@ -253,8 +246,7 @@ public class ScriptMetaData extends ScriptEntry implements 
Cloneable {
 return "\nParcelLocation = " + getParcelLocation() + 
"\nLocationPlaceHolder = " + locationPlaceHolder + super.toString();
 }
 
-public URL[] getClassPath(XComponentContext context)
-throws java.net.MalformedURLException
+public URL[] getClassPath() throws java.net.MalformedURLException
 {
 try
 {
@@ -282,7 +274,7 @@ public class ScriptMetaData extends ScriptEntry implements 
Cloneable {
 {
 String relativeClasspath =  (String)stk.nextElement();
 String pathToProcess  = PathUtils.make_url( parcelPath, 
relativeClasspath);
-URL url = expandURL( context, pathToProcess );
+URL url = createURL( pathToProcess );
 if ( url != null )
 {
 classPathVec.add (  url  );
@@ -291,7 +283,7 @@ public class ScriptMetaData extends ScriptEntry implements 
Cloneable {
 }
 if ( classPathVec.size() == 0)
 {
-URL url = expandURL( context, parcelPath );
+URL url = createURL( parcelPath );
 if ( url != null )
 {
 classPathVec.add(url);
@@

[PUSHED] Change in core[libreoffice-3-6]: fdo#52392 dbase: correctly NULL out non-filled in fields in ...

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/923

Approvals:
  Caolán McNamara: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/923
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id2e8ad5b6bed1c184de6dccf7fa43254099fb958
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Lionel Elie Mamane 
Gerrit-Reviewer: Caolán McNamara 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] Change in core[libreoffice-3-6-3]: fdo#53474: Fix Windows Java Accessibility Bridge

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/907

Approvals:
  Caolán McNamara: Verified; Looks good to me, approved
  Michael Meeks: Looks good to me, but someone else must approve


--
To view, visit https://gerrit.libreoffice.org/907
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9b582ba22667b1dae635828e85c4cc5b530353ac
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6-3
Gerrit-Owner: Stephan Bergmann 
Gerrit-Reviewer: Caolán McNamara 
Gerrit-Reviewer: Michael Meeks 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - connectivity/source

 connectivity/source/drivers/dbase/DTable.cxx |   16 
 connectivity/source/inc/dbase/DTable.hxx |2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 64b8b060a1496bb8ae85a1ef9fdc0f02f14f2813
Author: Lionel Elie Mamane 
Date:   Thu Oct 25 11:16:24 2012 +0200

fdo#52392 dbase: correctly NULL out non-filled in fields in inserted rows

Change-Id: Id2e8ad5b6bed1c184de6dccf7fa43254099fb958
Reviewed-on: https://gerrit.libreoffice.org/923
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/connectivity/source/drivers/dbase/DTable.cxx 
b/connectivity/source/drivers/dbase/DTable.cxx
index 18d531e..3add204 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -1513,7 +1513,7 @@ sal_Bool ODbaseTable::InsertRow(OValueRefVector& rRow, 
sal_Bool bFlush,const Ref
 sal_uInt32 nTempPos = m_nFilePos;
 
 m_nFilePos = (sal_uIntPtr)m_aHeader.db_anz + 1;
-sal_Bool bInsertRow = UpdateBuffer( rRow, NULL, _xCols );
+sal_Bool bInsertRow = UpdateBuffer( rRow, NULL, _xCols, true );
 if ( bInsertRow )
 {
 sal_uInt32 nFileSize = 0, nMemoFileSize = 0;
@@ -1575,7 +1575,7 @@ sal_Bool ODbaseTable::UpdateRow(OValueRefVector& rRow, 
OValueRefRow& pOrgRow,con
 m_pMemoStream->Seek(STREAM_SEEK_TO_END);
 nMemoFileSize = m_pMemoStream->Tell();
 }
-if (!UpdateBuffer(rRow, pOrgRow,_xCols) || !WriteBuffer())
+if (!UpdateBuffer(rRow, pOrgRow, _xCols, false) || !WriteBuffer())
 {
 if (HasMemoFields() && m_pMemoStream)
 m_pMemoStream->SetStreamSize(nMemoFileSize);// restore old size
@@ -1676,7 +1676,7 @@ static double toDouble(const rtl::OString& rString)
 }
 
 //--
-sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow 
pOrgRow,const Reference& _xCols)
+sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow 
pOrgRow, const Reference& _xCols, const bool bForceAllFields)
 {
 RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "ocke.jans...@sun.com", 
"ODbaseTable::UpdateBuffer" );
 OSL_ENSURE(m_pBuffer,"Buffer is NULL!");
@@ -1822,10 +1822,10 @@ sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector& 
rRow, OValueRefRow pOrgRow,c
 
 
 ++nPos; // the row values start at 1
-// If the variable is bound at all?
-if ( !rRow.get()[nPos]->isBound() )
+// don't overwrite non-bound columns
+if ( ! (bForceAllFields || rRow.get()[nPos]->isBound()) )
 {
-// No - the next field.
+// No - don't overwrite this field, it has not changed.
 nByteOffset += nLen;
 continue;
 }
@@ -1836,14 +1836,14 @@ sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector& 
rRow, OValueRefRow pOrgRow,c
 ODbaseIndex* pIndex = reinterpret_cast< ODbaseIndex* >( 
xTunnel->getSomething(ODbaseIndex::getUnoTunnelImplementationId()) );
 OSL_ENSURE(pIndex,"ODbaseTable::UpdateBuffer: No Index returned!");
 // Update !!
-if (pOrgRow.is() && !rRow.get()[nPos]->getValue().isNull() )
+if (pOrgRow.is() && rRow.get()[nPos]->isBound() && 
!rRow.get()[nPos]->getValue().isNull() )
 
pIndex->Update(m_nFilePos,*(pOrgRow->get())[nPos],*rRow.get()[nPos]);
 else
 pIndex->Insert(m_nFilePos,*rRow.get()[nPos]);
 }
 
 char* pData = (char *)(m_pBuffer + nByteOffset);
-if (rRow.get()[nPos]->getValue().isNull())
+if (rRow.get()[nPos]->getValue().isNull() || 
!rRow.get()[nPos]->isBound())
 {
 if ( bSetZero )
 memset(pData,0,nLen);   // Clear to NULL
diff --git a/connectivity/source/inc/dbase/DTable.hxx 
b/connectivity/source/inc/dbase/DTable.hxx
index 6ee8364..ec31dbc 100644
--- a/connectivity/source/inc/dbase/DTable.hxx
+++ b/connectivity/source/inc/dbase/DTable.hxx
@@ -116,7 +116,7 @@ namespace connectivity
 
 sal_Bool WriteMemo(ORowSetValue& aVariable, sal_uIntPtr& rBlockNr);
 sal_Bool WriteBuffer();
-sal_Bool UpdateBuffer(OValueRefVector& rRow, OValueRefRow 
pOrgRow,const ::com::sun::star::uno::Reference< 
::com::sun::star::container::XIndexAccess>& _xCols);
+sal_Bool UpdateBuffer(OValueRefVector& rRow, OValueRefRow 
pOrgRow,const ::com::sun::star::uno::Reference< 
::com::sun::star::container::XIndexAccess>& _xCols, bool bForceAllFields);
 ::com::sun::star::uno::Reference< 
::com::sun::star::beans::XPropertySet> isUniqueByColumnName(sal_Int32 
_nColumnPos);
 void AllocBuffer();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6-3' - accessibility/Jar_accessibility.mk accessibility/Jar_uno_accessbridge.mk accessibility/Module_accessibility.mk

 accessibility/Jar_accessibility.mk|   90 --
 accessibility/Jar_uno_accessbridge.mk |   50 ++
 accessibility/Module_accessibility.mk |1 
 3 files changed, 49 insertions(+), 92 deletions(-)

New commits:
commit c309ce0227a14330094191c1ef15fa00899defcb
Author: Stephan Bergmann 
Date:   Thu Oct 25 13:54:03 2012 +0200

fdo#53474: Fix Windows Java Accessibility Bridge

...by folding the contents of java_accessibility.jar back into
java_uno_accessbridge.jar.

In the old build system there were two jars, java_uno_accessbridge.jar
containing the handful of org.openoffice.accessibility classes and all
org.openoffice.java.accessibility classes (though how the latter got 
included
was fairly obscure in the makefile.mk) and unused java_accessibility.jar 
that
contained all org.openoffice.java.accessibility classes.  When adapting 
this to
gbuild, the unused java_accessibility.jar was carried over, but all its
org.openoffice.accessibility classes were inadvertently droped from
java_uno_accessbridge.jar.

(cherry picked from commit 5ba1694606577f9cda2b773d82ae765118bfc9e1)

Conflicts:
Repository.mk
accessibility/Jar_accessibility.mk
accessibility/Jar_uno_accessbridge.mk

Change-Id: I9b582ba22667b1dae635828e85c4cc5b530353ac
Reviewed-on: https://gerrit.libreoffice.org/907
Reviewed-by: Michael Meeks 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/accessibility/Jar_accessibility.mk 
b/accessibility/Jar_accessibility.mk
deleted file mode 100644
index 1d82c5f..000
--- a/accessibility/Jar_accessibility.mk
+++ /dev/null
@@ -1,90 +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) 2010 Red Hat, Inc., David Tardon 
-#  (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_Jar_Jar,java_accessibility))
-
-$(eval $(call gb_Jar_use_jars,java_accessibility,\
-$(OUTDIR)/bin/jurt.jar \
-$(OUTDIR)/bin/ridl.jar \
-$(OUTDIR)/bin/unoil.jar \
-))
-
-$(eval $(call gb_Jar_set_packageroot,java_accessibility,org))
-
-$(eval $(call gb_Jar_add_sourcefiles,java_accessibility,\
-accessibility/bridge/org/openoffice/java/accessibility/AbstractButton \
-
accessibility/bridge/org/openoffice/java/accessibility/AccessibleActionImpl \
-
accessibility/bridge/org/openoffice/java/accessibility/AccessibleComponentImpl \
-
accessibility/bridge/org/openoffice/java/accessibility/AccessibleEditableTextImpl
 \
-
accessibility/bridge/org/openoffice/java/accessibility/AccessibleExtendedState \
-
accessibility/bridge/org/openoffice/java/accessibility/AccessibleHypertextImpl \
-accessibility/bridge/org/openoffice/java/accessibility/AccessibleIconImpl \
-
accessibility/bridge/org/openoffice/java/accessibility/AccessibleKeyBinding \
-
accessibility/bridge/org/openoffice/java/accessibility/AccessibleObjectFactory \
-
accessibility/bridge/org/openoffice/java/accessibility/AccessibleRoleAdapter \
-
accessibility/bridge/org/openoffice/java/accessibility/AccessibleSelectionImpl \
-
accessibility/bridge/org/openoffice/java/accessibility/AccessibleStateAdapter \
-accessibility/bridge/org/openoffice/java/accessibility/AccessibleTextImpl \
-accessibility/bridge/org/openoffice/java/accessibility/AccessibleValueImpl 
\
-accessibility/bridge/org/openoffice/java/accessibility/Alert \
-accessibility/bridge/org/openoffice/java/accessibility/Application \
-accessibility/bridge/org/openoffice/java/accessibility/Button \
-accessibility/bridge/org/openoffice/java/accessibility/CheckBox \
-accessibility/bridge/org/openoffice/java/accessibility/ComboBox \
-accessibility/bridge/org/openoffice/java/accessibility/Component \
-accessibility/bridge/org/openoffice/java/accessibility/Container \
-accessibility/bridge/org/openoffice/java/accessibility/DescendantManager \
-accessibility

[PUSHED] rtl::OUString to OUString clean up

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/926

Approvals:
  Caolán McNamara: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/926
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3767ea89c8cfd9afe2dc8a80e5c7284be9d1cf57
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: gerhard öttl 
Gerrit-Reviewer: Caolán McNamara 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: sw/qa sw/source

 sw/qa/extras/rtfexport/rtfexport.cxx |4 
 sw/source/core/text/frmpaint.cxx |2 +-
 sw/source/core/text/inftxt.cxx   |   10 +-
 sw/source/core/text/itratr.cxx   |6 +++---
 sw/source/core/text/porexp.cxx   |2 +-
 sw/source/core/text/porfld.cxx   |2 +-
 sw/source/core/text/porfly.cxx   |2 +-
 sw/source/core/text/porglue.cxx  |2 +-
 sw/source/core/text/porlay.cxx   |4 ++--
 sw/source/core/text/pormulti.cxx |8 
 sw/source/core/text/porref.cxx   |2 +-
 sw/source/core/text/porrst.cxx   |4 ++--
 sw/source/core/text/portox.cxx   |2 +-
 sw/source/core/text/txtfld.cxx   |2 +-
 sw/source/core/text/txtftn.cxx   |4 ++--
 sw/source/core/text/txthyph.cxx  |6 +++---
 sw/source/core/text/txttab.cxx   |6 +++---
 sw/source/core/text/wrong.cxx|4 ++--
 sw/source/core/text/xmldump.cxx  |   10 +-
 19 files changed, 43 insertions(+), 39 deletions(-)

New commits:
commit 96ed67aadfb4e30b9870451eb3db90fae704df01
Author: gerhard oettl 
Date:   Wed Oct 24 07:28:15 2012 +0200

rtl::OUString to OUString clean up

unsing rtl::OUString, etc clauses had to be reinserted in
sw/qa/extras/rtfexport/rtfexport.cxx to pass the test

Change-Id: I3767ea89c8cfd9afe2dc8a80e5c7284be9d1cf57
Reviewed-on: https://gerrit.libreoffice.org/926
Tested-by: CaolÃ¡n McNamara 
Reviewed-by: CaolÃ¡n McNamara 

diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx 
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 7381fe2..bd3f273 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -37,6 +37,10 @@
 #include 
 #include 
 
+using rtl::OString;
+using rtl::OUString;
+using rtl::OUStringBuffer;
+
 class Test : public SwModelTestBase
 {
 public:
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index ca99ba6..e548cdf 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -551,7 +551,7 @@ sal_Bool SwTxtFrm::PaintEmpty( const SwRect &rRect, 
sal_Bool bCheck ) const
 // Don't show the paragraph mark for collapsed paragraphs, 
when they are hidden
 if ( EmptyHeight( ) > 1 )
 {
-const rtl::OUString aTmp( CH_PAR );
+const OUString aTmp( CH_PAR );
 SwDrawTextInfo aDrawInf( pSh, *pSh->GetOut(), 0, aTmp, 0, 
1 );
 aDrawInf.SetLeft( rRect.Left() );
 aDrawInf.SetRight( rRect.Right() );
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index e070151..1a1c286 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -823,7 +823,7 @@ static void lcl_DrawSpecial( const SwTxtPaintInfo& rInf, 
const SwLinePortion& rP
 }
 
 // check if char fits into rectangle
-const rtl::OUString aTmp( cChar );
+const OUString aTmp( cChar );
 aFontSize = rInf.GetTxtSize( aTmp ).SvLSize();
 while ( aFontSize.Width() > nMaxWidth )
 {
@@ -1100,7 +1100,7 @@ void SwTxtPaintInfo::_DrawBackBrush( const SwLinePortion 
&rPor ) const
 if(pFieldmark) {
 OSL_TRACE("Found Fieldmark");
 #if OSL_DEBUG_LEVEL > 1
-rtl::OUString str = pFieldmark->ToString( );
+OUString str = pFieldmark->ToString( );
 fprintf( stderr, "%s\n", rtl::OUStringToOString( str, 
RTL_TEXTENCODING_UTF8 ).getStr( ) );
 #endif
 }
@@ -1123,7 +1123,7 @@ void SwTxtPaintInfo::_DrawBackBrush( const SwLinePortion 
&rPor ) const
 SwTxtAttr* pTxtAttr = 
pNd->GetTxtAttrForCharAt(nEndIdx, RES_TXTATR_FIELD);
 const SwFmtFld& rPostItField = pTxtAttr->GetFld();
 // Look up the author name
-const rtl::OUString& rAuthor = 
rPostItField.GetFld()->GetPar1();
+const OUString& rAuthor = 
rPostItField.GetFld()->GetPar1();
 sal_uInt16 nIndex = 
pNd->GetDoc()->InsertRedlineAuthor(rAuthor);
 pOutDev->SetFillColor( 
SwPostItMgr::GetColorLight(nIndex) );
 pOutDev->SetLineColor( 
SwPostItMgr::GetColorAnchor(nIndex) );
@@ -1636,7 +1636,7 @@ SwTxtSlot::SwTxtSlot( const SwTxtSizeInfo *pNew, const 
SwLinePortion *pPor,
 else if( !pTempList && nPos < pOldSmartTagList->Count() && 
nListPos < nIdx && aTxt.Len() )
 {
 pTempList = new SwWrongList( WRONGLIST_SMARTTAG );
-pTempList->Insert( rtl::OUString(), 0, 0, aTxt.Len(), 0 );
+pTempList->Insert( OUString(), 0, 0, aTxt.Len(), 0 );
 ((SwTxtPaintInfo*)pInf)->SetSmartTags( pTempList );
 }
 else
@@ -1652,7 +1652,7 @@ SwTxtSlot::SwTxtSlot( const SwTxtSizeInfo *pNew, const 
SwLinePortion *pPor,

[Libreoffice-commits] .: 3 commits - reportdesign/source writerfilter/source

 reportdesign/source/filter/xml/xmlComponent.cxx |1 -
 reportdesign/source/filter/xml/xmlExport.cxx|1 -
 reportdesign/source/ui/report/SectionWindow.cxx |3 ---
 reportdesign/source/ui/report/ViewsWindow.cxx   |7 ---
 writerfilter/source/rtftok/rtfdocumentimpl.hxx  |8 
 5 files changed, 4 insertions(+), 16 deletions(-)

New commits:
commit 3149d338fc2d766f7e0e974ecf1993b42f32e98d
Author: CaolÃ¡n McNamara 
Date:   Sat Oct 27 16:26:43 2012 +0100

usual int == sal_Int32 on 64bit and long == sal_Int32 on 32bit woes

Change-Id: I879ed580de72df91e269d38add23cddd29c71982

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 43dc748..c0956f7 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -251,10 +251,10 @@ namespace writerfilter {
 public:
 RTFShape();
 std::vector< std::pair > 
aProperties;
-int nLeft;
-int nTop;
-int nRight;
-int nBottom;
+sal_Int32 nLeft;
+sal_Int32 nTop;
+sal_Int32 nRight;
+sal_Int32 nBottom;
 sal_Int16 nHoriOrientRelation;
 sal_Int16 nVertOrientRelation;
 int nWrap;
commit 6df1405b6891ec8f3280e61a3cded41c7f048041
Author: CaolÃ¡n McNamara 
Date:   Sat Oct 27 16:22:35 2012 +0100

loplugin: various objects that are never used

Change-Id: I379540dcce5cd0adae0f0f670821af92ab6432f4

diff --git a/reportdesign/source/filter/xml/xmlComponent.cxx 
b/reportdesign/source/filter/xml/xmlComponent.cxx
index 47c8556..dfc8b75 100644
--- a/reportdesign/source/filter/xml/xmlComponent.cxx
+++ b/reportdesign/source/filter/xml/xmlComponent.cxx
@@ -61,7 +61,6 @@ OXMLComponent::OXMLComponent( ORptFilter& _rImport
 const SvXMLTokenMap& rTokenMap = _rImport.GetComponentElemTokenMap();
 
 const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
-static const ::rtl::OUString s_sTRUE = 
::xmloff::token::GetXMLToken(XML_TRUE);
 
 for(sal_Int16 i = 0; i < nLength; ++i)
 {
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx 
b/reportdesign/source/filter/xml/xmlExport.cxx
index 18b71bd..9df73c0 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -447,7 +447,6 @@ void ORptExport::exportComponent(const 
Reference& _xReportComp
 void ORptExport::exportFormatConditions(const Reference& 
_xReportElement)
 {
 OSL_ENSURE(_xReportElement.is(),"_xReportElement is NULL -> GPF");
-::rtl::OUString sDataField = 
convertFormula(_xReportElement->getDataField());
 const sal_Int32 nCount = _xReportElement->getCount();
 try
 {
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx 
b/reportdesign/source/ui/report/ViewsWindow.cxx
index 66381a2..842f360 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -241,14 +241,7 @@ void OViewsWindow::resize(const OSectionWindow& 
_rSectionWindow)
 pSectionWindow->getEndMarker().Invalidate( nIn );
 }
 }
-Fraction aStartWidth(long(REPORT_STARTMARKER_WIDTH));
-aStartWidth *= GetMapMode().GetScaleX();
-Size aOut = GetOutputSizePixel();
-aOut.Width() = aStartWidth;
-aOut = PixelToLogic(aOut);
 m_pParent->notifySizeChanged();
-
-Rectangle aRect(PixelToLogic(Point(0,0)),aOut);
 }
 
//--
 void OViewsWindow::Resize()
commit 850b4ce0418766d084a97d8850187faed7fdba84
Author: CaolÃ¡n McNamara 
Date:   Sat Oct 27 16:17:08 2012 +0100

t4 is always true, probably some debugging thing

Change-Id: I8038174c64d2ed5eb3cae503dbde49be96dd7d5c

diff --git a/reportdesign/source/ui/report/SectionWindow.cxx 
b/reportdesign/source/ui/report/SectionWindow.cxx
index eefc892..4030f8e 100644
--- a/reportdesign/source/ui/report/SectionWindow.cxx
+++ b/reportdesign/source/ui/report/SectionWindow.cxx
@@ -122,13 +122,10 @@ void OSectionWindow::_propertyChanged(const 
beans::PropertyChangeEvent& _rEvent)
 const uno::Reference< report::XSection> xCurrentSection = 
m_aReportSection.getSection();
 if ( _rEvent.PropertyName.equals(PROPERTY_HEIGHT) )
 {
-static bool t4 = true;
-if ( t4 )
 m_pParent->getView()->SetUpdateMode(sal_False);
 //Resize();
 m_pParent->getView()->notifySizeChanged();
 m_pParent->resize(*this);
-if ( t4 )
 m_pParent->getView()->SetUpdateMode(sal_True);
 // 
getViewsWindow()->getView()->getReportView()->getController().resetZoomType();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
ht

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

 i18npool/inc/i18npool/languagetag.hxx   |5 -
 i18npool/source/languagetag/languagetag.cxx |8 
 unusedcode.easy |1 -
 3 files changed, 14 deletions(-)

New commits:
commit d4fb3b42b81a9b5a973dcd29759579593cd01f06
Author: Julien Nabet 
Date:   Sat Oct 27 17:09:04 2012 +0200

Remove unused overrideDataPath

Change-Id: I7dfaa933d918023999bfe78a497da7dbd59f7fc1

diff --git a/i18npool/inc/i18npool/languagetag.hxx 
b/i18npool/inc/i18npool/languagetag.hxx
index 36ab7a2..7475cf0 100644
--- a/i18npool/inc/i18npool/languagetag.hxx
+++ b/i18npool/inc/i18npool/languagetag.hxx
@@ -120,11 +120,6 @@ public:
 /** If this is a valid BCP 47 language tag. */
 boolisValidBcp47() const;
 
-/** Needed for unit test in build environment, must be called before any
-LanguageTag is instanciated.
- */
-static void overrideDataPath( const rtl::OUString& 
rPath );
-
 private:
 
 enum Decision
diff --git a/i18npool/source/languagetag/languagetag.cxx 
b/i18npool/source/languagetag/languagetag.cxx
index 14cad58..8e96d61 100644
--- a/i18npool/source/languagetag/languagetag.cxx
+++ b/i18npool/source/languagetag/languagetag.cxx
@@ -138,14 +138,6 @@ void LiblantagDataRef::setupDataPath()
 lt_db_set_datadir( maDataPath.getStr());
 }
 
-
-// static
-void LanguageTag::overrideDataPath( const rtl::OUString& rPath )
-{
-theDataRef.presetDataPath( rPath);
-}
-
-
 LanguageTag::LanguageTag( const rtl::OUString & rBcp47LanguageTag, bool 
bCanonicalize )
 :
 maBcp47( rBcp47LanguageTag),
diff --git a/unusedcode.easy b/unusedcode.easy
index 5c54e28..bb758da 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,5 +1,4 @@
 FontSelectPattern::FontSelectPattern(PhysicalFontFace const&, Size const&, 
float, int, bool)
-LanguageTag::overrideDataPath(rtl::OUString const&)
 RelatedMultipart::getIds()
 SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, 
unsigned int, unsigned char)
 ScFiltersTest::testColorScaleODS()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source sfx2/inc sfx2/source sw/source unusedcode.easy

 cui/source/dialogs/insdlg.cxx |7 ---
 cui/source/inc/insdlg.hxx |1 
 sfx2/inc/sfx2/thumbnailview.hxx   |9 
 sfx2/source/control/thumbnailview.cxx |   69 --
 sw/source/ui/inc/swvset.hxx   |7 +--
 sw/source/ui/misc/insrule.cxx |6 --
 unusedcode.easy   |   32 ---
 7 files changed, 28 insertions(+), 103 deletions(-)

New commits:
commit 6affa4be69aa31e27af9d50e9ab6bd740319c379
Author: CaolÃ¡n McNamara 
Date:   Sat Oct 27 15:13:34 2012 +0100

callcatcher: update list, stop hiding uncalled tests :-)

Change-Id: I9bd81a9c5e85db4512a3e4768c9b87696c91b7bc

diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 9b0529e..de7e610 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -91,13 +91,6 @@ uno::Reference< io::XInputStream > 
InsertObjectDialog_Impl::GetIconIfIconified(
 return uno::Reference< io::XInputStream >();
 }
 
-InsertObjectDialog_Impl::InsertObjectDialog_Impl( Window * pParent, const 
ResId & rResId, const com::sun::star::uno::Reference < 
com::sun::star::embed::XStorage >& xStorage )
- : ModalDialog( pParent, rResId )
- , m_xStorage( xStorage )
- , aCnt( m_xStorage )
-{
-}
-
 InsertObjectDialog_Impl::InsertObjectDialog_Impl(Window * pParent, const 
OString& rID,
 const OUString& rUIXMLDescription,
 const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& 
xStorage)
diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx
index 1f9daae..37fe1e2 100644
--- a/cui/source/inc/insdlg.hxx
+++ b/cui/source/inc/insdlg.hxx
@@ -44,7 +44,6 @@ protected:
 const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& 
m_xStorage;
 comphelper::EmbeddedObjectContainer aCnt;
 
-InsertObjectDialog_Impl( Window * pParent, const ResId & rResId, const 
com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage );
 InsertObjectDialog_Impl(Window * pParent, const OString& rID,
 const OUString& rUIXMLDescription,
 const com::sun::star::uno::Reference < com::sun::star::embed::XStorage 
>& xStorage);
diff --git a/sfx2/inc/sfx2/thumbnailview.hxx b/sfx2/inc/sfx2/thumbnailview.hxx
index 12d2812..084b3d1 100644
--- a/sfx2/inc/sfx2/thumbnailview.hxx
+++ b/sfx2/inc/sfx2/thumbnailview.hxx
@@ -179,16 +179,10 @@ public:
 
 virtual ~ThumbnailView ();
 
-void InsertItem( sal_uInt16 nItemId,
- const BitmapEx &rImage, const OUString &rStr,
- size_t nPos = THUMBNAILVIEW_APPEND );
-
 void RemoveItem( sal_uInt16 nItemId );
 
 void Clear();
 
-size_t GetItemCount() const;
-
 size_t GetItemPos( sal_uInt16 nItemId ) const;
 
 sal_uInt16 GetItemId( size_t nPos ) const;
@@ -300,13 +294,10 @@ protected:
 SFX2_DLLPRIVATE void ImplInitScrollBar();
 SFX2_DLLPRIVATE void ImplDeleteItems();
 SFX2_DLLPRIVATE void ImplDraw();
-using Window::ImplScroll;
-SFX2_DLLPRIVATE bool ImplScroll( const Point& rPos );
 SFX2_DLLPRIVATE size_t   ImplGetItem( const Point& rPoint, bool bMove 
= false ) const;
 SFX2_DLLPRIVATE ThumbnailViewItem*ImplGetItem( size_t nPos );
 SFX2_DLLPRIVATE sal_uInt16  ImplGetVisibleItemCount() const;
 SFX2_DLLPRIVATE ThumbnailViewItem*ImplGetVisibleItem( sal_uInt16 
nVisiblePos );
-SFX2_DLLPRIVATE void ImplInsertItem( ThumbnailViewItem *const 
pItem, const size_t nPos );
 SFX2_DLLPRIVATE voidImplFireAccessibleEvent( short nEventId, 
const ::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& 
rNewValue );
 SFX2_DLLPRIVATE bool ImplHasAccessibleListeners();
 DECL_DLLPRIVATE_LINK( ImplScrollHdl, ScrollBar* );
diff --git a/sfx2/source/control/thumbnailview.cxx 
b/sfx2/source/control/thumbnailview.cxx
index 6741b59..fd2d215 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -405,40 +405,6 @@ void ThumbnailView::CalculateItemPositions ()
 delete pDelScrBar;
 }
 
-bool ThumbnailView::ImplScroll( const Point& rPos )
-{
-if ( !mbScroll || !maItemListRect.IsInside(rPos) )
-return false;
-
-const long nScrollOffset = (mnItemHeight <= 16) ? SCROLL_OFFSET/2 : 
SCROLL_OFFSET;
-bool bScroll = false;
-
-if ( rPos.Y() <= maItemListRect.Top()+nScrollOffset )
-{
-if ( mnFirstLine > 0 )
-{
---mnFirstLine;
-bScroll = true;
-}
-}
-else if ( rPos.Y() >= maItemListRect.Bottom()-nScrollOffset )
-{
-if ( mnFirstLine < static_cast(mnLines-mnVisLines) )
-{
-++mnFirstLine;
-bScroll = true;
-}
-}
-
-if ( !bScroll )
-return false;
-
-if ( IsReallyVisible() && IsUpdateMode() )
-Invalidate();
-
-return true;
-}
-
 size_t ThumbnailView::ImplGetItem(

[Libreoffice-commits] .: 2 commits - shell/Library_ooofilt_x64.mk shell/Library_propertyhdl_x64.mk shell/Library_shlxthdl_x64.mk shell/StaticLibrary_shlxthandler_common_x64.mk tools/CustomTarget_rever

 shell/Library_ooofilt_x64.mk   |2 +-
 shell/Library_propertyhdl_x64.mk   |2 +-
 shell/Library_shlxthdl_x64.mk  |2 +-
 shell/StaticLibrary_shlxthandler_common_x64.mk |4 ++--
 tools/CustomTarget_reversemap.mk   |2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit ec64bf60d902afbec91e6eed3dbda08e075ffc3f
Author: MatÃºÅ¡ Kukan 
Date:   Sat Oct 27 15:23:42 2012 +0200

shell: use x64 zlib version here

Change-Id: Ie61966f28b937db7d4997753cc388332dda25f63

diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk
index 7ea3109..e3baee3 100644
--- a/shell/Library_ooofilt_x64.mk
+++ b/shell/Library_ooofilt_x64.mk
@@ -55,7 +55,7 @@ $(eval $(call gb_Library_add_defs,ooofilt_x64,\
 
 $(eval $(call gb_Library_use_externals,ooofilt_x64,\
expat_utf16_x64 \
-   zlib \
+   zlib_x64 \
 ))
 
 $(eval $(call gb_Library_use_system_win32_libs,ooofilt_x64,\
diff --git a/shell/Library_propertyhdl_x64.mk b/shell/Library_propertyhdl_x64.mk
index 5b07b4c..e6e9c59 100644
--- a/shell/Library_propertyhdl_x64.mk
+++ b/shell/Library_propertyhdl_x64.mk
@@ -55,7 +55,7 @@ $(eval $(call gb_Library_add_defs,propertyhdl_x64,\
 
 $(eval $(call gb_Library_use_externals,propertyhdl_x64,\
expat_utf16_x64 \
-   zlib \
+   zlib_x64 \
 ))
 
 $(eval $(call gb_Library_use_system_win32_libs,propertyhdl_x64,\
diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk
index 0d70683..33656b4 100644
--- a/shell/Library_shlxthdl_x64.mk
+++ b/shell/Library_shlxthdl_x64.mk
@@ -55,7 +55,7 @@ $(eval $(call gb_Library_add_defs,shlxthdl_x64,\
 
 $(eval $(call gb_Library_use_externals,shlxthdl_x64,\
expat_utf16_x64 \
-   zlib \
+   zlib_x64 \
 ))
 
 $(eval $(call gb_Library_use_system_win32_libs,shlxthdl_x64,\
diff --git a/shell/StaticLibrary_shlxthandler_common_x64.mk 
b/shell/StaticLibrary_shlxthandler_common_x64.mk
index 175f8ee..41b1ae6 100644
--- a/shell/StaticLibrary_shlxthandler_common_x64.mk
+++ b/shell/StaticLibrary_shlxthandler_common_x64.mk
@@ -53,8 +53,8 @@ $(eval $(call 
gb_StaticLibrary_add_defs,shlxthandler_common_x64,\
 ))
 
 $(eval $(call gb_StaticLibrary_use_externals,shlxthandler_common_x64,\
-   expat_utf16 \
-   zlib \
+   expat_utf16_x64 \
+   zlib_x64 \
 ))
 
 $(eval $(call 
gb_StaticLibrary_add_x64_generated_exception_objects,shlxthandler_common_x64,\
commit 88b363abeb05a2f0b0e4900216169a4cae7b3dcf
Author: MatÃºÅ¡ Kukan 
Date:   Sat Oct 27 14:52:00 2012 +0200

there is no sal_textenc for Android

Change-Id: I7a55f775cf1b9d608a71e1d754df7027545c1254

diff --git a/tools/CustomTarget_reversemap.mk b/tools/CustomTarget_reversemap.mk
index a047909..5cfdaed 100644
--- a/tools/CustomTarget_reversemap.mk
+++ b/tools/CustomTarget_reversemap.mk
@@ -30,7 +30,7 @@ $(call gb_CustomTarget_get_target,tools/reversemap) : \
 
 $(call gb_CustomTarget_get_workdir,tools/reversemap)/reversemap.hxx : \
$(call gb_Executable_get_target_for_build,bestreversemap) \
-   | $(call gb_Library_get_target,sal_textenc) \
+   | $(if $(filter-out ANDROID,$(OS)),$(call 
gb_Library_get_target,sal_textenc)) \
$(call gb_CustomTarget_get_workdir,tools/reversemap)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),BRM,1)
$(call gb_Helper_execute,bestreversemap > $@)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Calc does not respect absolute cell references when sorting

2012-10-27 Thread Noel Grandin

this mailing list is for discussing actual code development.

Either (a) take this to the discuss mailing list or (b) report it in bugzilla.

Unless, of course, you want help actually writing a fix for the bug,
in which case we can help you :-)
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: binfilter helpcontent2

 binfilter|2 +-
 helpcontent2 |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0736a7ddc00047361e01429cd8f6286341babd0a
Author: CaolÃ¡n McNamara 
Date:   Sat Oct 27 13:13:47 2012 +0100

bump to new .gitignore versions

Change-Id: I3e60cfa1a8680b84142bc4d0adda96f970e030cd

diff --git a/binfilter b/binfilter
index 3c9d49e..93e9d8f 16
--- a/binfilter
+++ b/binfilter
@@ -1 +1 @@
-Subproject commit 3c9d49ef2b9fd4c46a6760e599f923e559d56a54
+Subproject commit 93e9d8f14a400a57d251cf24ae76c767803cd5a8
diff --git a/helpcontent2 b/helpcontent2
index 5bfa031..50b30c2 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 5bfa0312c389fab33dde8bc3d196dc51764b12b4
+Subproject commit 50b30c29041679bbf20ee9c4d2b7558b9b84601c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: .gitignore

 .gitignore |   18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)

New commits:
commit 50b30c29041679bbf20ee9c4d2b7558b9b84601c
Author: CaolÃ¡n McNamara 
Date:   Sat Oct 27 13:11:44 2012 +0100

sync .gitignore to avoid dirty submodules


http://stackoverflow.com/questions/4873980/git-tells-me-my-subproject-is-dirty-what-does-this-mean

diff --git a/.gitignore b/.gitignore
index decad29..79d3fb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,13 +11,29 @@
 /wiki-to-help/mwlib_mods/*.pyc
 
 # the build directories
+/callcatcher
 /unxlng??
 /unxlng??.pro
+/unxlng???
+/unxlng???.pro
 /wntmsc???
 /wntmsc???.pro
+/wntgcc?
+/wntgcc?.pro
 /unxmac??
 /unxmac??.pro
-/wntgcci.pro
+/unx?bsd??
+/unx?bsd??.pro
+/unxdfly??
+/unxdfly??.pro
+/unxso???
+/unxso???.pro
+/unxaig??
+/unxaig??.pro
+/unxios?
+/unxios?.pro
+/unxand?
+/unxand?.pro
 
 # libxslt debug memdump
 .memdump
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: .gitignore

 .gitignore |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 93e9d8f14a400a57d251cf24ae76c767803cd5a8
Author: CaolÃ¡n McNamara 
Date:   Sat Oct 27 13:11:23 2012 +0100

ignore callcatcher dir

diff --git a/.gitignore b/.gitignore
index 0adb1e8..a76781f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,7 @@
 .stgit-edit.txt
 
 # Build directories:
+/callcatcher
 /unxlng??
 /unxlng??.pro
 /unxlng???
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/inc/attrib.hxx   |1 
 sc/source/core/data/attrib.cxx  |6 -
 sc/source/filter/excel/xltoolbar.cxx|4 ---
 sc/source/filter/excel/xltoolbar.hxx|1 
 sc/source/ui/condformat/colorformat.cxx |   33 
 sc/source/ui/inc/colorformat.hxx|1 
 unusedcode.easy |3 --
 7 files changed, 49 deletions(-)

New commits:
commit 7b633213c0d814d0fd485a6070291944e9890cee
Author: MatÃºÅ¡ Kukan 
Date:   Fri Oct 26 16:33:35 2012 +0200

unusedcode: sc: unused ctors

Change-Id: Iaa082d85ef95c58da14013c80cb06a2e1112d4ef

diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx
index eb051fd..af401d1 100644
--- a/sc/inc/attrib.hxx
+++ b/sc/inc/attrib.hxx
@@ -399,7 +399,6 @@ public:
 TYPEINFO();
 
 explicit ScCondFormatItem();
-explicit ScCondFormatItem(sal_uInt32 nIndex);
 explicit ScCondFormatItem(const std::vector& nIndex);
 
 virtual ~ScCondFormatItem();
diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx
index 6a29e52..d666229 100644
--- a/sc/source/core/data/attrib.cxx
+++ b/sc/source/core/data/attrib.cxx
@@ -1228,12 +1228,6 @@ ScCondFormatItem::ScCondFormatItem():
 {
 }
 
-ScCondFormatItem::ScCondFormatItem( sal_uInt32 nIndex ):
-SfxPoolItem( ATTR_CONDITIONAL )
-{
-maIndex.push_back(nIndex);
-}
-
 ScCondFormatItem::ScCondFormatItem( const std::vector& rIndex ):
 SfxPoolItem( ATTR_CONDITIONAL ),
 maIndex( rIndex )
diff --git a/sc/source/filter/excel/xltoolbar.cxx 
b/sc/source/filter/excel/xltoolbar.cxx
index f582ab8..2bb994e 100644
--- a/sc/source/filter/excel/xltoolbar.cxx
+++ b/sc/source/filter/excel/xltoolbar.cxx
@@ -94,10 +94,6 @@ CTBS::CTBS() : bSignature(0), bVersion(0), reserved1(0), 
reserved2(0), reserved3
 {
 }
 
-ScCTB::ScCTB() : nViews( 0 ), ectbid(0)
-{
-}
-
 ScCTB::ScCTB(sal_uInt16 nNum ) : nViews( nNum ), ectbid(0)
 {
 }
diff --git a/sc/source/filter/excel/xltoolbar.hxx 
b/sc/source/filter/excel/xltoolbar.hxx
index cc97943..ed598d5 100644
--- a/sc/source/filter/excel/xltoolbar.hxx
+++ b/sc/source/filter/excel/xltoolbar.hxx
@@ -74,7 +74,6 @@ class ScCTB : public TBBase
 std::vector< ScTBC > rTBC;
 bool ImportCustomToolBar_Impl( ScCTBWrapper&, CustomToolBarImportHelper& );
 public:
-ScCTB();
 ScCTB(sal_uInt16);
 ~ScCTB(){}
 void Print( FILE* );
diff --git a/sc/source/ui/condformat/colorformat.cxx 
b/sc/source/ui/condformat/colorformat.cxx
index 7983591..8d77b8a 100644
--- a/sc/source/ui/condformat/colorformat.cxx
+++ b/sc/source/ui/condformat/colorformat.cxx
@@ -36,39 +36,6 @@
 #include 
 #include 
 
-ScDataBarSettingsDlg::ScDataBarSettingsDlg(Window* pWindow, ScDocument* pDoc, 
const ScAddress& rPos):
-ModalDialog( pWindow, ScResId( RID_SCDLG_DATABAR ) ),
-maBtnOk( this, ScResId( BTN_OK ) ),
-maBtnCancel( this, ScResId( BTN_CANCEL ) ),
-maFlBarColors( this, ScResId( FL_BAR_COLORS ) ),
-maFlAxes( this, ScResId( FL_AXIS ) ),
-maFlValues( this, ScResId( FL_VALUES ) ),
-maFtMin( this, ScResId( FT_MINIMUM ) ),
-maFtMax( this, ScResId( FT_MAXIMUM ) ),
-maFtPositive( this, ScResId( FT_POSITIVE ) ),
-maFtNegative( this, ScResId( FT_NEGATIVE ) ),
-maFtPosition( this, ScResId( FT_POSITION ) ),
-maFtAxisColor( this, ScResId( FT_COLOR_AXIS ) ),
-maLbPos( this, ScResId( LB_POS ) ),
-maLbNeg( this, ScResId( LB_NEG ) ),
-maLbAxisCol( this, ScResId( LB_COL_AXIS ) ),
-maLbTypeMin( this, ScResId( LB_TYPE ) ),
-maLbTypeMax( this, ScResId( LB_TYPE ) ),
-maLbAxisPos( this, ScResId( LB_AXIS_POSITION ) ),
-maEdMin( this, ScResId( ED_MIN ) ),
-maEdMax( this, ScResId( ED_MAX ) ),
-mpNumberFormatter( pDoc->GetFormatTable() ),
-mpDoc(pDoc),
-maPos(rPos)
-{
-Init();
-FreeResource();
-
-maLbTypeMin.SelectEntryPos(0);
-maLbTypeMax.SelectEntryPos(0);
-maLbAxisPos.SelectEntryPos(0);
-}
-
 namespace {
 
 void SetType(const ScColorScaleEntry* pEntry, ListBox& rLstBox)
diff --git a/sc/source/ui/inc/colorformat.hxx b/sc/source/ui/inc/colorformat.hxx
index 3c58131..13bb74b 100644
--- a/sc/source/ui/inc/colorformat.hxx
+++ b/sc/source/ui/inc/colorformat.hxx
@@ -75,7 +75,6 @@ private:
 void Init();
 
 public:
-ScDataBarSettingsDlg(Window* pParent, ScDocument* pDoc, const ScAddress& 
rPos);
 ScDataBarSettingsDlg(Window* pParent, const ScDataBarFormatData& rData, 
ScDocument* pDoc, const ScAddress& rPos);
 
 ScDataBarFormatData* GetData();
diff --git a/unusedcode.easy b/unusedcode.easy
index 9d9d3a6..6c09c56 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,10 +1,7 @@
 FontSelectPattern::FontSelectPattern(PhysicalFontFace const&, Size const&, 
float, int, bool)
 RelatedMultipart::getIds()
 SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, 
unsigned int, unsigned char)
-ScCTB::ScCTB()
-ScCondFormatItem::ScCondFormatItem(unsigned int)
 ScConditionalFormat::dumpInfo(rtl::OUStringBuffer

Re: Build of master fails somewhere in the end

2012-10-27 Thread Matúš Kukan

Hi Regina,

On 27 October 2012 13:06, Regina Henschel  wrote:
> I find error message in the fetch log:
> Cloning into helpcontent2...
> fatal: reference is not a tree: 2cc7764943882fa89e31c96f6e0467c96bda3976
> Unable to checkout '2cc7764943882fa89e31c96f6e0467c96bda3976' in submodule
> path 'helpcontent2'

It seems you are between af8d133ea0698ce7a163664e061d9ed33fb358c6 and
9ffc1f4e03d1477eaa29873267161e7697c55d3f
The latter just reverts the first one.
So, either revert af8d133ea0698ce7a163664e061d9ed33fb358c6 or ./g pull -r

> Trying 'make fetch' again gives only:
> make[1]: Nothing to be done for `fetch'.
>
> How to get helpcontent2 afterwards?

rm src.downloaded
and then make fetch

All the best,
Matus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Build of master fails somewhere in the end

2012-10-27 Thread Regina Henschel


Hi Matúš,

Matúš Kukan schrieb:

On 27 October 2012 09:25, Regina Henschel  wrote:

Hi all,

I tried to build LO with MSVC on WinXP, but building fails somewhere in the
end. I have attached the file build_error.log.



: ERROR: Removing file shared_en-US.zip from file list.
: ERROR: Removing file sbasic_en-US.zip from file list.
: ERROR: Removing file scalc_en-US.zip from file list.
: ERROR: Removing file schart_en-US.zip from file list.
: ERROR: Removing file sdatabase_en-US.zip from file list.
: ERROR: Removing file sdraw_en-US.zip from file list.
: ERROR: Removing file simpress_en-US.zip from file list.
: ERROR: Removing file smath_en-US.zip from file list.
: ERROR: Removing file swriter_en-US.zip from file list.

means you don't have helpcontent2 built and delivered.
No idea why.


I find error message in the fetch log:
Cloning into helpcontent2...
fatal: reference is not a tree: 2cc7764943882fa89e31c96f6e0467c96bda3976
Unable to checkout '2cc7764943882fa89e31c96f6e0467c96bda3976' in 
submodule path 'helpcontent2'


And indeed folder helpcontent2 exists but is empty besides subfolder .git.


Either ensure that make helpcontent2.deliver does something or
add --without-help to autogen.lastrun; make scp2.clean and make again


Trying 'make fetch' again gives only:
make[1]: Nothing to be done for `fetch'.

How to get helpcontent2 afterwards?

Kind regards
Regina
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: 5 commits - writerfilter/source

 writerfilter/source/filter/RtfFilter.cxx   |   13 +
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   58 +
 2 files changed, 64 insertions(+), 7 deletions(-)

New commits:
commit beffbd826a74f3751bd34d7747e401de7d836457
Author: Miklos Vajna 
Date:   Sat Oct 27 12:39:10 2012 +0200

fix top/left/right/bottom margin of RTF imported inline images

This is similar to 3d7e168a2a43c2414b0633379102ddb29437e75b, but for RTF
(Word default is 0, Writer is something larger).

Change-Id: Ibb429eed5d3c1d09777db88ba2a98503c8ed0ed8

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 7950e29..1fab293 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -744,6 +744,10 @@ int RTFDocumentImpl::resolvePict(bool bInline)
 if (bInline)
 {
 RTFSprms aInlineAttributes;
+aInlineAttributes.set(NS_ooxml::LN_CT_Inline_distT, 
RTFValue::Pointer_t(new RTFValue(0)));
+aInlineAttributes.set(NS_ooxml::LN_CT_Inline_distB, 
RTFValue::Pointer_t(new RTFValue(0)));
+aInlineAttributes.set(NS_ooxml::LN_CT_Inline_distL, 
RTFValue::Pointer_t(new RTFValue(0)));
+aInlineAttributes.set(NS_ooxml::LN_CT_Inline_distR, 
RTFValue::Pointer_t(new RTFValue(0)));
 RTFSprms aInlineSprms;
 aInlineSprms.set(NS_ooxml::LN_CT_Inline_extent, pExtentValue);
 aInlineSprms.set(NS_ooxml::LN_CT_Inline_docPr, pDocprValue);
commit 7b60f3f1335ddf105b77e2cd5c6743a7419d985c
Author: Miklos Vajna 
Date:   Sat Oct 27 12:31:04 2012 +0200

fdo#42407 fix RTF import of WMF images inside textframes

Since commit f4f4a899, we send the external header of WMF images to the
importer, but that seems to be cause problems with this document. To be
on the safe side, revert this only for pictures inside textframes.

Change-Id: I7e443beb9ca4261abf3e3a1257270d6c70b85918

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 66313f6..7950e29 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -641,7 +641,11 @@ int RTFDocumentImpl::resolvePict(bool bInline)
 aExtHeader.mapMode = m_aStates.top().aPicture.eWMetafile;
 aExtHeader.xExt = m_aStates.top().aPicture.nWidth;
 aExtHeader.yExt = m_aStates.top().aPicture.nHeight;
-OUString aGraphicUrl = m_pGraphicHelper->importGraphicObject(xInputStream, 
&aExtHeader);
+WMF_EXTERNALHEADER* pExtHeader = &aExtHeader;
+uno::Reference 
xServiceInfo(m_aStates.top().aDrawingObject.xShape, uno::UNO_QUERY);
+if (xServiceInfo.is() && 
xServiceInfo->supportsService("com.sun.star.text.TextFrame"))
+pExtHeader = 0;
+OUString aGraphicUrl = m_pGraphicHelper->importGraphicObject(xInputStream, 
pExtHeader);
 
 if (m_aStates.top().aPicture.nStyle == BMPSTYLE_PNG)
 {
commit a7cc5039769838924c7b07da0e7532d84f79d302
Author: Miklos Vajna 
Date:   Sat Oct 27 12:27:09 2012 +0200

ignore spaces while reading RTF image data

Change-Id: I6a1af0cd98ed832204d4485e135da6e56e575b4a

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 064c879..66313f6 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -610,7 +610,7 @@ int RTFDocumentImpl::resolvePict(bool bInline)
 for (int i = 0; i < aStr.getLength(); ++i)
 {
 char ch = str[i];
-if (ch != 0x0d && ch != 0x0a)
+if (ch != 0x0d && ch != 0x0a && ch != 0x20)
 {
 b = b << 4;
 sal_Int8 parsed = m_pTokenizer->asHex(ch);
commit 5944eba64a8679cb6db7b54709169175d82224de
Author: Miklos Vajna 
Date:   Sat Oct 27 12:25:26 2012 +0200

writerfilter: make it easy to debug the old RTF filter

Change-Id: Ifc1d6b78f55e7f202f5cc391f1401de5b65ed395

diff --git a/writerfilter/source/filter/RtfFilter.cxx 
b/writerfilter/source/filter/RtfFilter.cxx
index f80d1b0..27373a4 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@@ -103,6 +103,18 @@ sal_Bool RtfFilter::filter( const uno::Sequence< 
beans::PropertyValue >& aDescri
 uno::Reference xFrame = 
aMediaDesc.getUnpackedValueOrDefault(MediaDescriptor::PROP_FRAME(),
 uno::Reference());
 
+#ifdef DBG_OLDFILTER
+uno::Reference< lang::XMultiServiceFactory > 
xMSF(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW);
+uno::Reference< uno::XInterface > xIfc( xMSF->createInstance( 
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( 
"com.sun.star.comp.Writer.RtfImport" ))), uno::UNO_QUERY_THROW);
+if (!xIfc.is())
+return sal_False;
+uno::Reference< document::XImporter > xImprtr(xIfc, 
uno::UNO_QUERY_THROW);
+

Re: Build of master fails somewhere in the end

2012-10-27 Thread Matúš Kukan

On 27 October 2012 09:25, Regina Henschel  wrote:
> Hi all,
>
> I tried to build LO with MSVC on WinXP, but building fails somewhere in the
> end. I have attached the file build_error.log.
>

: ERROR: Removing file shared_en-US.zip from file list.
: ERROR: Removing file sbasic_en-US.zip from file list.
: ERROR: Removing file scalc_en-US.zip from file list.
: ERROR: Removing file schart_en-US.zip from file list.
: ERROR: Removing file sdatabase_en-US.zip from file list.
: ERROR: Removing file sdraw_en-US.zip from file list.
: ERROR: Removing file simpress_en-US.zip from file list.
: ERROR: Removing file smath_en-US.zip from file list.
: ERROR: Removing file swriter_en-US.zip from file list.

means you don't have helpcontent2 built and delivered.
No idea why.
Either ensure that make helpcontent2.deliver does something or
add --without-help to autogen.lastrun; make scp2.clean and make again

HTH,
Matus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: svx/source

 svx/source/tbxctrls/tbcontrl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e690875f2469b6e73818d642c0e59ddecde218f5
Author: Ivan Timofeev 
Date:   Sat Oct 27 13:45:47 2012 +0400

fix resource id

Change-Id: Ief85da80e14078e1d5a0b2812a2959484717da76

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 57ac134..bca2249 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1329,7 +1329,7 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( sal_uInt16 nId, 
const Reference< XFrame
 SetOutputSizePixel( Size( 114, 144 ) );
 
 m_aLineStyleLb.SetSourceUnit( FUNIT_TWIP );
-m_aLineStyleLb.SetNone( SVX_RESSTR(STR_NONE) );
+m_aLineStyleLb.SetNone( SVX_RESSTR(RID_SVXSTR_NONE) );
 
 using namespace table::BorderLineStyle;
 m_aLineStyleLb.InsertEntry( SvxBorderLine::getWidthImpl( SOLID ), SOLID );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PATCH] fdo#42135: Appending a library functionality in Macro Programming missing or misdocumented

2012-10-27 Thread Norbert Thiebaud

On Fri, Oct 26, 2012 at 6:47 PM, Norbert Thiebaud  wrote:
>>
>> Ah!! but that also means that the automatic commit in the super module
>> by gerrit will not work anymore... IIRC.
>>
>
> Stephan, you may want to revert that... since the hassle of setting up
> a pushurl once is much less than not being able to manage patch via
> the review system for submodules...
>

Indeed until the following patch is released, relative path break the
auto-managment of submodules by gerrit

https://gerrit-review.googlesource.com/#/c/36190/

so
http://cgit.freedesktop.org/libreoffice/core/commit/?id=5e48667f6bdd2f5e05b3f41d080fda06bd3d7c16
should be reverted until then...

Stephan can you please revert it ?

Norbert
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] rtl::OUString to OUString clean up