date:20130228

 cui/source/tabpages/tparea.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit d6d9c1137d4779e82a6060b4a0c74b589eaf9fbe
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Feb 27 20:57:01 2013 +

Resolves: fdo#61241 force area page to size itself for max visible controls

Change-Id: I2d67ce71528786ef300ab83ee1e5b1cad6b4abe8
(cherry picked from commit fc8022431a1684f3cfb1e2f7e4ec923a8e71df94)
Reviewed-on: https://gerrit.libreoffice.org/2450
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 87b410f..47f4878 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -765,6 +765,13 @@ SvxAreaTabPage::SvxAreaTabPage( Window* pParent, const 
SfxItemSet rInAttrs ) :
 aLbColor.SetAccessibleRelationMemberOf( aFlProp );
 aMtrFldOffset.SetAccessibleRelationLabeledBy(aFlOffset);
 aMtrFldOffset.SetAccessibleName(aFlOffset.GetText());
+
+//fdo#61241 lock down size of this tab page until it's
+//converted to .ui (remember to use some sizegroups
+//that take into account hidden frames)
+Size aSize(GetSizePixel());
+set_width_request(aSize.Width());
+set_height_request(aSize.Height());
 }
 
 // ---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-0] Resolves: fdo#61241 force area page to size itself for max v...

2013-02-28 Thread Miklos Vajna (via Code Review)

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/2450

Approvals:
  Miklos Vajna: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2d67ce71528786ef300ab83ee1e5b1cad6b4abe8
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Caolán McNamara caol...@redhat.com
Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz

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

[Libreoffice-commits] core.git: configure.ac

2013-02-28 Thread Tor Lillqvist

 configure.ac |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1f97fe05473f72cc79b2d08fa3477e8fbca73bac
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Feb 28 10:13:02 2013 +0200

Pass --srcdir to the BUILD platform sub-configure

Change-Id: I52491e9ea6f8460c9fa3e2dd94313ac0f05dd3e9

diff --git a/configure.ac b/configure.ac
index 5015812..9b77395 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4101,6 +4101,7 @@ if test $cross_compiling = yes; then
 --without-doxygen \
 ENABLE_PDFIMPORT=FALSE \
 $sub_conf_opts \
+--srcdir=$srcdir \
 21 | sed -e 's/^//'
 test -f ./config_host.mk 2/dev/null || exit
 cp config_host.mk ../config_build.mk
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [ANNOUNCE] libreoffice-4.0.1.2 tag created

2013-02-28 Thread Petr Mladek

Petr Mladek píše v St 27. 02. 2013 v 16:13 +0100:
 Hi,
 
 there have been created the tag libreoffice-4.0.1.2, aka rc2. The
 corresponding official builds will be available within next few days.
 It will be used as final if no blocker is found.

 Linux distro packages might find source tarballs at
 http://dev-builds.libreoffice.org/pre-releases/src/
 They will be available from the official page together with the builds.

Please, note that you need libcmis-0.3.1 if you use the system library.
You could find the sources at http://sourceforge.net/projects/libcmis/

The configure check has already been fixed in master and 4-0 branch, see
http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-4-0id=f37c63e8cb203d9303a994a0369a2fab1e88d7ba

We want to leave 4.0.1.2 as is because this problem mostly affects only
the few distro maintainers who build from the source tarballs or tag.
They should get noticed by this mail :-)

Best Regards,
Petr

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

[Libreoffice-commits] core.git: Makefile.build Makefile.cross Makefile.in

 Makefile.build |2 ++
 Makefile.cross |2 +-
 Makefile.in|4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 2057218fbc9a688fe8d3aff64634d8826e4b6ebe
Author: MatÃºÅ¡ Kukan matus.ku...@gmail.com
Date:   Thu Feb 28 09:51:12 2013 +0100

fix BUILDDIR  SRCDIR in makefiles

Change-Id: I7b6cc6b638cec5e552492548a878325b3fe1119d

diff --git a/Makefile.build b/Makefile.build
index 857eb25..a13aa83 100644
--- a/Makefile.build
+++ b/Makefile.build
@@ -7,7 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
+ifeq (,$(SOLARENV))
 include $(dir $(realpath $(firstword $(MAKEFILE_LISTconfig_host.mk
+endif
 
 gb_Side := host
 include $(SOLARENV)/gbuild/gbuild.mk
diff --git a/Makefile.cross b/Makefile.cross
index dd5cf81..711ee26 100644
--- a/Makefile.cross
+++ b/Makefile.cross
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-include $(dir $(realpath $(firstword $(MAKEFILE_LISTconfig_build.mk
+include $(BUILDDIR)/config_build.mk
 
 gb_Side := build
 include $(SOLARENV)/gbuild/gbuild.mk
diff --git a/Makefile.in b/Makefile.in
index 7cd9548..09788ff 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -126,11 +126,11 @@ distclean : clean compilerplugins-clean
 $(BUILDDIR)/config_host.mk \
 $(BUILDDIR)/config_host.mk.stamp \
 $(BUILDDIR)/config_host/*.h \
+$(BUILDDIR)/config_host/*.mk \
 $(BUILDDIR)/configure \
 $(BUILDDIR)/instsetoo_native/util/openoffice.lst \
 $(BUILDDIR)/lo.xcent \
-$(BUILDDIR)/solenv/inc/minor.mk \
-$(BUILDDIR)/warn
+$(BUILDDIR)/solenv/inc/minor.mk
find $(SOLARENV)/gdb -name *.pyc -exec rm {} \;
 
 #
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - l10ntools/Executable_renewpo.mk l10ntools/Module_l10ntools.mk l10ntools/source Repository.mk

 Repository.mk   |1 
 l10ntools/Executable_renewpo.mk |   37 -
 l10ntools/Module_l10ntools.mk   |1 
 l10ntools/source/localize.cxx   |   28 
 l10ntools/source/renewpo.cxx|  253 
 5 files changed, 1 insertion(+), 319 deletions(-)

New commits:
commit f820d854dc9affa3e41f1dc73deaee782eb38c65
Author: Andras Timar ati...@suse.com
Date:   Thu Feb 28 09:56:53 2013 +0100

renewpo was needed one time only, 3.6-4.0 conversion. Dropped

Change-Id: I8ad66eb5e664590f596ffb9e76b50b5a95aab456

diff --git a/Repository.mk b/Repository.mk
index c2c0257f..c742709 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -57,7 +57,6 @@ $(eval $(call gb_Helper_register_executables,NONE, \
 propex \
 reg2bin \
 regsvrex \
-renewpo \
 rsc \
 rscdep \
 saxparser \
diff --git a/l10ntools/Executable_renewpo.mk b/l10ntools/Executable_renewpo.mk
deleted file mode 100644
index acea019..000
--- a/l10ntools/Executable_renewpo.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# convert old po to new po
-#
-
-$(eval $(call gb_Executable_Executable,renewpo))
-
-$(eval $(call gb_Executable_set_include,renewpo,\
--I$(SRCDIR)/l10ntools/inc \
-$$(INCLUDE) \
-))
-
-$(eval $(call gb_Executable_use_libraries,renewpo,\
-sal \
-))
-
-$(eval $(call gb_Executable_use_static_libraries,renewpo,\
-transex \
-))
-
-$(eval $(call gb_Executable_add_exception_objects,renewpo,\
-l10ntools/source/renewpo \
-))
-
-$(eval $(call gb_Executable_use_externals,renewpo,\
-boost_headers \
-icuuc \
-icui18n \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/l10ntools/Module_l10ntools.mk b/l10ntools/Module_l10ntools.mk
index 276ebfb..53b2f40 100644
--- a/l10ntools/Module_l10ntools.mk
+++ b/l10ntools/Module_l10ntools.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_Module_add_targets,l10ntools,\
 Executable_xrmex \
 Executable_localize \
 Executable_transex3 \
-Executable_renewpo \
 Executable_propex \
 Executable_treex \
 Executable_stringex \
diff --git a/l10ntools/source/renewpo.cxx b/l10ntools/source/renewpo.cxx
deleted file mode 100644
index 60466fc..000
--- a/l10ntools/source/renewpo.cxx
+++ /dev/null
@@ -1,253 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include iostream
-#include fstream
-#include string
-#include vector
-#include map
-
-#include osl/file.hxx
-#include rtl/string.hxx
-
-#include po.hxx
-
-using namespace std;
-
-bool isInSameFile( const OString rFirstLine, const OString rSecondLine)
-{
-const OString rFirstSource =
-rFirstLine.getToken(PoEntry::SOURCEFILE,'\t');
-const OString rSecondSource =
-rSecondLine.getToken(PoEntry::SOURCEFILE,'\t');
-return
-rFirstSource.copy(0,rFirstSource.lastIndexOf(\\)) ==
-rSecondSource.copy(0,rSecondSource.lastIndexOf(\\));
-}
-
-
-//Get path of po file
-OString GetPath(const OString rPath, const OString rLine)
-{
-OString sSourceFile = rLine.getToken(PoEntry::SOURCEFILE,'\t');
-OString sSourcePath = rPath + / +
-  rLine.getToken(PoEntry::PROJECT,'\t') + / +
-  sSourceFile.copy(0,sSourceFile.lastIndexOf(\\)).
-  replaceAll(\\,/);
-return sSourcePath;
-}
-
-OString DelLocalId(const OString rLine)
-{
-unsigned nTabIndex = 0;
-for(unsigned nComponent=0; nComponentPoEntry::LOCALID; ++nComponent)
-{
-nTabIndex = rLine.indexOf('\t',nTabIndex);
-++nTabIndex;
-}
-return rLine.replaceAt(nTabIndex,
-   rLine.indexOf('\t',nTabIndex)-nTabIndex,
-   );
-}
-
-//Renew po files of the actual language
-void HandleLanguage(const OString LangEntryName, const OString rOldPath,
-const OString rNewPath, const OString rpo2loPath,
-const OString rSDFPath)
-{
-//Generate and open sdf
-cout  Process start with language:LangEntryName.getStr()  endl;
-OUString aTempUrl;
-if (osl::FileBase::createTempFile(0, 0, aTempUrl)
-!= osl::FileBase::E_None)
-{
-cerr  osl::FileBase::createTempFile() failed\n;
-return;
-}
-OUString aTempPath;
-if (osl::FileBase::getSystemPathFromFileURL(aTempUrl, aTempPath)
-!= osl::FileBase::E_None)
-{
-cerr
-

renewpo was needed one time only, 3.6-4.0 conversion. Dropped

2013-02-28 Thread Lionel Elie Mamane

About your commit

commit f820d854dc9affa3e41f1dc73deaee782eb38c65
author Andras Timar ati...@suse.com   2013-02-28 08:56:53 (GMT)

renewpo was needed one time only, 3.6-4.0 conversion. Dropped
Change-Id: I8ad66eb5e664590f596ffb9e76b50b5a95aab456


This sounds like you are breaking upgrades from 3.6 to 4.1...

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/qa writerfilter/source

2013-02-28 Thread Miklos Vajna

 sw/qa/extras/ooxmlimport/data/fdo53985.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx|   11 +++
 writerfilter/source/dmapper/PropertyMap.cxx |   15 ++-
 3 files changed, 25 insertions(+), 1 deletion(-)

New commits:
commit 0a12e1278b2ea6a4a668d610ff3c6a23c5fc6249
Author: Miklos Vajna vmik...@suse.cz
Date:   Wed Feb 27 14:46:35 2013 +0100

fdo#53985 DOCX import: don't try to set empty PageDescName

Regression from 50cb1667020494906afaacb68d4163d1eda527cf.

Change-Id: Ie04d5ad37555ed4cfeb34ccb8dc021675fbd25ea

Conflicts:

sw/qa/extras/ooxmlimport/ooxmlimport.cxx

Signed-off-by: Jan Holesovsky ke...@suse.cz

diff --git a/sw/qa/extras/ooxmlimport/data/fdo53985.docx 
b/sw/qa/extras/ooxmlimport/data/fdo53985.docx
new file mode 100644
index 000..0c8b32f
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/fdo53985.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 69dc0cb..2c32f13 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -111,6 +111,7 @@ public:
 void testN780645();
 void testFineTableDash();
 void testN779642();
+void testFdo53985();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX)  !defined(WNT)
@@ -174,6 +175,7 @@ void Test::run()
 {n780645.docx, Test::testN780645},
 {tableborder-finedash.docx, Test::testFineTableDash},
 {n779642.docx, Test::testN779642},
+{fdo53985.docx, Test::testFdo53985},
 };
 for (unsigned int i = 0; i  SAL_N_ELEMENTS(aMethods); ++i)
 {
@@ -1085,6 +1087,15 @@ void Test::testN779642()
 CPPUNIT_ASSERT_EQUAL_MESSAGE(Wrong vertical orientation relation, 
nValue, text::RelOrientation::PAGE_PRINT_AREA);
 }
 
+void Test::testFdo53985()
+{
+// Unhandled excetion prevented import of the rest of the document.
+
+uno::Referencetext::XTextTablesSupplier xTablesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess 
xTables(xTablesSupplier-getTextTables( ), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(5), xTables-getCount()); // Only 4 tables 
were imported.
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx 
b/writerfilter/source/dmapper/PropertyMap.cxx
index c2fe9ef..8f19057 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -840,7 +840,20 @@ void SectionPropertyMap::CloseSectionGroup( 
DomainMapper_Impl rDM_Impl )
 ApplyColumnProperties( xSection );
 uno::Referencebeans::XPropertySet 
xRangeProperties(lcl_GetRangeProperties(m_bIsFirstSection, rDM_Impl, 
m_xStartingRange));
 if (xRangeProperties.is())
-
xRangeProperties-setPropertyValue(rPropNameSupplier.GetName(PROP_PAGE_DESC_NAME),
 uno::makeAny(m_bTitlePage ? m_sFirstPageStyleName : m_sFollowPageStyleName));
+{
+OUString aName = m_bTitlePage ? m_sFirstPageStyleName : 
m_sFollowPageStyleName;
+if (!aName.isEmpty())
+{
+try
+{
+
xRangeProperties-setPropertyValue(rPropNameSupplier.GetName(PROP_PAGE_DESC_NAME),
 uno::makeAny(aName));
+}
+catch( const uno::Exception )
+{
+SAL_WARN(writerfilter, failed to set PageDescName!);
+}
+}
+}
 }
 // If the section is of type New column (0x01), then simply insert a 
column break.
 // But only if there actually are columns on the page, otherwise a column 
break
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH libreoffice-4-0] fdo#53985 DOCX import: don't try to set empty PageDescName

2013-02-28 Thread Miklos Vajna (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2460

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/60/2460/1

fdo#53985 DOCX import: don't try to set empty PageDescName

Regression from 50cb1667020494906afaacb68d4163d1eda527cf.

(cherry picked from commit 8281578b89c3df3fe3452a594f6b21483683638a)

Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx

Change-Id: Ie04d5ad37555ed4cfeb34ccb8dc021675fbd25ea
---
A sw/qa/extras/ooxmlimport/data/fdo53985.docx
M sw/qa/extras/ooxmlimport/ooxmlimport.cxx
M writerfilter/source/dmapper/PropertyMap.cxx
3 files changed, 25 insertions(+), 1 deletion(-)



diff --git a/sw/qa/extras/ooxmlimport/data/fdo53985.docx 
b/sw/qa/extras/ooxmlimport/data/fdo53985.docx
new file mode 100644
index 000..0c8b32f
--- /dev/null
+++ b/sw/qa/extras/ooxmlimport/data/fdo53985.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 69dc0cb..2c32f13 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -111,6 +111,7 @@
 void testN780645();
 void testFineTableDash();
 void testN779642();
+void testFdo53985();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX)  !defined(WNT)
@@ -174,6 +175,7 @@
 {n780645.docx, Test::testN780645},
 {tableborder-finedash.docx, Test::testFineTableDash},
 {n779642.docx, Test::testN779642},
+{fdo53985.docx, Test::testFdo53985},
 };
 for (unsigned int i = 0; i  SAL_N_ELEMENTS(aMethods); ++i)
 {
@@ -1085,6 +1087,15 @@
 CPPUNIT_ASSERT_EQUAL_MESSAGE(Wrong vertical orientation relation, 
nValue, text::RelOrientation::PAGE_PRINT_AREA);
 }
 
+void Test::testFdo53985()
+{
+// Unhandled excetion prevented import of the rest of the document.
+
+uno::Referencetext::XTextTablesSupplier xTablesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess 
xTables(xTablesSupplier-getTextTables( ), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(5), xTables-getCount()); // Only 4 tables 
were imported.
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx 
b/writerfilter/source/dmapper/PropertyMap.cxx
index c2fe9ef..8f19057 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -840,7 +840,20 @@
 ApplyColumnProperties( xSection );
 uno::Referencebeans::XPropertySet 
xRangeProperties(lcl_GetRangeProperties(m_bIsFirstSection, rDM_Impl, 
m_xStartingRange));
 if (xRangeProperties.is())
-
xRangeProperties-setPropertyValue(rPropNameSupplier.GetName(PROP_PAGE_DESC_NAME),
 uno::makeAny(m_bTitlePage ? m_sFirstPageStyleName : m_sFollowPageStyleName));
+{
+OUString aName = m_bTitlePage ? m_sFirstPageStyleName : 
m_sFollowPageStyleName;
+if (!aName.isEmpty())
+{
+try
+{
+
xRangeProperties-setPropertyValue(rPropNameSupplier.GetName(PROP_PAGE_DESC_NAME),
 uno::makeAny(aName));
+}
+catch( const uno::Exception )
+{
+SAL_WARN(writerfilter, failed to set PageDescName!);
+}
+}
+}
 }
 // If the section is of type New column (0x01), then simply insert a 
column break.
 // But only if there actually are columns on the page, otherwise a column 
break

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie04d5ad37555ed4cfeb34ccb8dc021675fbd25ea
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Miklos Vajna vmik...@suse.cz

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

Re: renewpo was needed one time only, 3.6-4.0 conversion. Dropped

Hi,

On Thu, Feb 28, 2013 at 10:05 AM, Lionel Elie Mamane lio...@mamane.lu wrote:
 About your commit

 commit f820d854dc9affa3e41f1dc73deaee782eb38c65
 author Andras Timar ati...@suse.com   2013-02-28 08:56:53 (GMT)

 renewpo was needed one time only, 3.6-4.0 conversion. Dropped
 Change-Id: I8ad66eb5e664590f596ffb9e76b50b5a95aab456


 This sounds like you are breaking upgrades from 3.6 to 4.1...


This tool was used to convert 3.6 po files to the new format, that we
started to use in 4.0. This conversion was done long ago. The tool was
never used neither by the build process, nor by LibreOffice. It was
just a utility that I needed once.

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

[ABANDONED libreoffice-4-0] fdo#53985 DOCX import: don't try to set empty PageDescName

2013-02-28 Thread Jan Holesovsky (via Code Review)

Jan Holesovsky has abandoned this change.

Change subject: fdo#53985 DOCX import: don't try to set empty PageDescName
..


Patch Set 1: Abandoned

I've cherry-picked this manually, abandoning this change :-)

http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-4-0id=0a12e1278b2ea6a4a668d610ff3c6a23c5fc6249

Thank you for this!

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: Ie04d5ad37555ed4cfeb34ccb8dc021675fbd25ea
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Miklos Vajna vmik...@suse.cz

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

[ABANDONED] Translate German comments in SD (drawdoc{1,4}.cxx)

2013-02-28 Thread Stefan Knorr (via Code Review)

Stefan Knorr has abandoned this change.

Change subject: Translate German comments in SD (drawdoc{1,4}.cxx)
..


Patch Set 1: Abandoned

Accidentally submitted new patchset in a way that gerrit doesn't recognise it 
as this one...

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: If012eab34e04b690fd9f3df403cd6ca3092e264c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Stefan Knorr heinzless...@gmail.com
Gerrit-Reviewer: Philipp Riemer ruderphil...@gmail.com

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

Re: renewpo was needed one time only, 3.6-4.0 conversion. Dropped

2013-02-28 Thread Lionel Elie Mamane

On Thu, Feb 28, 2013 at 10:13:58AM +0100, Andras Timar wrote:

 On Thu, Feb 28, 2013 at 10:05 AM, Lionel Elie Mamane lio...@mamane.lu wrote:
 About your commit

 renewpo was needed one time only, 3.6-4.0 conversion. Dropped
 Change-Id: I8ad66eb5e664590f596ffb9e76b50b5a95aab456

 This tool was used to convert 3.6 po files to the new format, that
 we started to use in 4.0. The tool was never used (...) by
 LibreOffice. It was just a utility that I needed once.

OK, sorry. I thought it was used in the migration of every user from
3.6 to 4.0.

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

Re: Tinderbox failure, Linux-x86-64@8-SLED11, MASTER, last success: 2013-02-28 07:11:32

On 28 February 2013 10:13, ke...@suse.cz ke...@suse.cz wrote:
 [build CPY] CustomTarget/odk/odkcommon/idl.udkapi.done
 [build CPY] CustomTarget/odk/odkcommon/idl.offapi.done
 [build CUS] odk/odkcommon/include
 [build CPY] CustomTarget/odk/odkcommon/configure.pl
 [build CPY] CustomTarget/odk/odkcommon/setsdkenv_unix
 [build CPY] CustomTarget/odk/odkcommon/setsdkenv_unix.sh.in
 cp: cannot create directory 
 `/local/home/tinderbox/master/workdir/unxlngx6.pro/CustomTarget/odk/odkcommon/idl/com':
  File exists
 [build CPY] CustomTarget/odk/odkcommon/setsdkenv_unix.csh.in
 make[1]: *** 
 [/local/home/tinderbox/master/workdir/unxlngx6.pro/CustomTarget/odk/odkcommon/idl.offapi.done]
  Error 1
 make[1]: *** Waiting for unfinished jobs
 make: *** [build] Error 2

Can't cp just copy files which are not there into the directory?
What we are doing there is
mkdir -p CustomTarget/odk/odkcommon/idl
cp -rf udkapi/com CustomTarget/odk/odkcommon/idl
cp -rf offapi/com CustomTarget/odk/odkcommon/idl - fails ?

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

[Libreoffice-commits] core.git: 2 commits - cairo/ExternalProject_cairo.mk cui/uiconfig

 cairo/ExternalProject_cairo.mk|2 +-
 cui/uiconfig/ui/pageformatpage.ui |   13 +
 2 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit c0f85e6879e527ff0673c82e84e8ee0afcc6a5ec
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Feb 28 09:45:54 2013 +

Resolves: fdo#61571 cairo not linking against internal libpng

the flag is called SYSTEM_LIBPNG not SYSTEM_PNG

Change-Id: I703a669f544e539f7fcfa64c0121a73f0608aecc

diff --git a/cairo/ExternalProject_cairo.mk b/cairo/ExternalProject_cairo.mk
index 8d21189..42a5c7f 100644
--- a/cairo/ExternalProject_cairo.mk
+++ b/cairo/ExternalProject_cairo.mk
@@ -41,7 +41,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) :
pixman_LIBS=-L$(call 
gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1 \
COMPRESS=$(if $(filter YES,$(SYSTEM_ZLIB)),compress,z_compress) 
\
ZLIB3RDLIB=-lz \
-   $(if $(filter 
NO,$(SYSTEM_PNG)),png_CFLAGS=-I$(OUTDIR)/inc/external/libpng 
png_LIBS=-L$(OUTDIR)/lib -lpng) \
+   $(if $(filter 
NO,$(SYSTEM_LIBPNG)),png_CFLAGS=-I$(OUTDIR)/inc/external/libpng 
png_LIBS=-L$(OUTDIR)/lib -lpng) \
$(if $(filter IOS,$(OS)),--disable-shared,--disable-static) \
$(if $(filter ANDROID IOS,$(OS)),--disable-xlib,--enable-xlib) \
$(if $(filter IOS,$(OS)),--enable-quartz --enable-quartz-font) \
commit b1c0d8a7cbbf60cc6725727f61880e27e7e6346f
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Feb 27 23:26:35 2013 +

make things line up nicely in page format

5 sizegroups is probably excessive, but results looks reasonable to me

Change-Id: I1c0318e2ba0abf77b529d78b30d9af5ec630e6ac

diff --git a/cui/uiconfig/ui/pageformatpage.ui 
b/cui/uiconfig/ui/pageformatpage.ui
index 00bb88d..1463671 100644
--- a/cui/uiconfig/ui/pageformatpage.ui
+++ b/cui/uiconfig/ui/pageformatpage.ui
@@ -13,7 +13,6 @@
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=hexpandTrue/property
-property name=vexpandTrue/property
 property name=label_xalign0/property
 property name=shadow_typenone/property
 child
@@ -235,7 +234,6 @@
   object class=GtkGrid id=grid4
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=hexpandTrue/property
 property name=row_spacing6/property
 property name=column_spacing12/property
 child
@@ -258,6 +256,7 @@
   object class=GtkLabel id=labelPaperTray
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=hexpandTrue/property
 property name=xalign0/property
 property name=label translatable=yesPaper 
_tray:/property
 property name=use_underlineTrue/property
@@ -274,7 +273,6 @@
   object class=GtkComboBox id=comboPaperTray
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=hexpandTrue/property
   /object
   packing
 property name=left_attach1/property
@@ -503,13 +501,13 @@
   object class=GtkGrid id=grid7
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=hexpandTrue/property
 property name=row_spacing6/property
 property name=column_spacing12/property
 child
   object class=GtkLabel id=labelPageLayout
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=hexpandTrue/property
 property name=xalign0/property
 property name=label translatable=yes_Page 
layout:/property
 property name=use_underlineTrue/property
@@ -526,6 +524,7 @@
   object class=GtkLabel id=label4
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=hexpandTrue/property
 property name=xalign0/property
 property name=label 
translatable=yes_Format:/property
 property name=use_underlineTrue/property
@@ -585,6 +584,7 @@
   object class=GtkLabel id=labelTblAlign

[Libreoffice-commits] core.git: 8 commits - cui/source forms/source sfx2/inc starmath/source svx/source ucb/source

2013-02-28 Thread Markus Mohrhard

 cui/source/dialogs/hltpbase.cxx   |  142 --
 cui/source/tabpages/chardlg.cxx   |3 
 forms/source/xforms/xpathlib/xpathlib.cxx |4 
 sfx2/inc/sfx2/bindings.hxx|3 
 starmath/source/parse.cxx |4 
 svx/source/dialog/rubydialog.cxx  |1 
 ucb/source/ucp/tdoc/tdoc_datasupplier.cxx |   22 
 7 files changed, 34 insertions(+), 145 deletions(-)

New commits:
commit aa8091bc25b67189dd7a43ff85ef3ae11df0971b
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Feb 28 10:06:05 2013 +0100

remove useless comment lines

Change-Id: I884a97d36ff2ed2f4526cf96af9cac214af4db31

diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx 
b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
index 6c33708..f356e99 100644
--- a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
@@ -107,14 +107,7 @@ DataSupplier_Impl::~DataSupplier_Impl()
 
 }
 
-//=
-//=
-//
 // DataSupplier Implementation.
-//
-//=
-//=
-
 ResultSetDataSupplier::ResultSetDataSupplier(
 const uno::Reference uno::XComponentContext  rxContext,
 const rtl::Reference Content  rContent,
@@ -123,14 +116,12 @@ ResultSetDataSupplier::ResultSetDataSupplier(
 {
 }
 
-//=
 // virtual
 ResultSetDataSupplier::~ResultSetDataSupplier()
 {
 delete m_pImpl;
 }
 
-//=
 // virtual
 rtl::OUString
 ResultSetDataSupplier::queryContentIdentifierString( sal_uInt32 nIndex )
@@ -155,7 +146,6 @@ ResultSetDataSupplier::queryContentIdentifierString( 
sal_uInt32 nIndex )
 return rtl::OUString();
 }
 
-//=
 // virtual
 uno::Reference ucb::XContentIdentifier 
 ResultSetDataSupplier::queryContentIdentifier( sal_uInt32 nIndex )
@@ -184,7 +174,6 @@ ResultSetDataSupplier::queryContentIdentifier( sal_uInt32 
nIndex )
 return uno::Reference ucb::XContentIdentifier ();
 }
 
-//=
 // virtual
 uno::Reference ucb::XContent 
 ResultSetDataSupplier::queryContent( sal_uInt32 nIndex )
@@ -221,7 +210,6 @@ ResultSetDataSupplier::queryContent( sal_uInt32 nIndex )
 return uno::Reference ucb::XContent ();
 }
 
-//=
 // virtual
 sal_Bool ResultSetDataSupplier::getResult( sal_uInt32 nIndex )
 {
@@ -292,7 +280,6 @@ sal_Bool ResultSetDataSupplier::getResult( sal_uInt32 
nIndex )
 return bFound;
 }
 
-//=
 // virtual
 sal_uInt32 ResultSetDataSupplier::totalCount()
 {
@@ -343,21 +330,18 @@ sal_uInt32 ResultSetDataSupplier::totalCount()
 return m_pImpl-m_aResults.size();
 }
 
-//=
 // virtual
 sal_uInt32 ResultSetDataSupplier::currentCount()
 {
 return m_pImpl-m_aResults.size();
 }
 
-//=
 // virtual
 sal_Bool ResultSetDataSupplier::isCountFinal()
 {
 return m_pImpl-m_bCountFinal;
 }
 
-//=
 // virtual
 uno::Reference sdbc::XRow 
 ResultSetDataSupplier::queryPropertyValues( sal_uInt32 nIndex  )
@@ -388,7 +372,6 @@ ResultSetDataSupplier::queryPropertyValues( sal_uInt32 
nIndex  )
 return uno::Reference sdbc::XRow ();
 }
 
-//=
 // virtual
 void ResultSetDataSupplier::releasePropertyValues( sal_uInt32 nIndex )
 {
@@ -398,13 +381,11 @@ void ResultSetDataSupplier::releasePropertyValues( 
sal_uInt32 nIndex )
 m_pImpl-m_aResults[ nIndex ]-xRow = uno::Reference sdbc::XRow ();
 }
 
-//=
 // virtual
 void ResultSetDataSupplier::close()
 {
 }
 
-//=
 // virtual
 void ResultSetDataSupplier::validate()
 throw( ucb::ResultSetException )
@@ -413,7 +394,6 @@ void ResultSetDataSupplier::validate()
 throw ucb::ResultSetException();
 }
 
-//=
 bool ResultSetDataSupplier::queryNamesOfChildren()
 {
 osl::Guard osl::Mutex  aGuard( m_pImpl-m_aMutex );
@@ -440,7 +420,6 @@ bool ResultSetDataSupplier::queryNamesOfChildren()
 return true;
 }

[Libreoffice-commits] core.git: sd/source

2013-02-28 Thread Markus Mohrhard

 sd/source/ui/remotecontrol/BluetoothServer.cxx |2 +-
 sd/source/ui/remotecontrol/BluetoothServer.hxx |4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 75082a3bf7401fad10c2806a3f7ce268160d7ab1
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Wed Feb 27 21:31:22 2013 +0100

coverity#988423: fix memory leak

Change-Id: I3ac2cca7e24e6cc1b47b42c2d42bc7caee91b559
Reviewed-on: https://gerrit.libreoffice.org/2458
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com

diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx 
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 9c271aa..475e0c1 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -586,7 +586,7 @@ BluetoothServer::BluetoothServer( 
std::vectorCommunicator** pCommunicators )
 mpCommunicators( pCommunicators )
 {
 #ifdef LINUX_BLUETOOTH
-mpImpl = new BluetoothServerImpl();
+mpImpl.reset(new BluetoothServerImpl());
 #endif
 (void) mpImpl; // Avoid warning: private field 'mpImpl' is not used
 }
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.hxx 
b/sd/source/ui/remotecontrol/BluetoothServer.hxx
index 8078ede..bfaeccc 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.hxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.hxx
@@ -12,6 +12,8 @@
 #include osl/thread.hxx
 #include vector
 
+#include boost/scoped_ptr.hpp
+
 namespace sd
 {
 class Communicator;
@@ -40,7 +42,7 @@ namespace sd
 enum { UNKNOWN, DISCOVERABLE, NOT_DISCOVERABLE } meWasDiscoverable;
 static BluetoothServer *spServer;
 
-BluetoothServerImpl *mpImpl;
+boost::scoped_ptrBluetoothServerImpl mpImpl;
 virtual void SAL_CALL run();
 
 void cleanupCommunicators();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] coverity#988423: fix memory leak

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/2458

Approvals:
  Michael Meeks: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3ac2cca7e24e6cc1b47b42c2d42bc7caee91b559
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
Gerrit-Reviewer: Michael Meeks michael.me...@suse.com
Gerrit-Reviewer: Thorsten Behrens tbehr...@suse.com

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

Re: Tinderbox failure, Linux-x86-64@8-SLED11, MASTER, last success: 2013-02-28 07:11:32

2013-02-28 Thread Stephan Bergmann


On 02/28/2013 10:47 AM, Matúš Kukan wrote:

On 28 February 2013 10:13, ke...@suse.cz ke...@suse.cz wrote:

[build CPY] CustomTarget/odk/odkcommon/idl.udkapi.done
[build CPY] CustomTarget/odk/odkcommon/idl.offapi.done
[build CUS] odk/odkcommon/include
[build CPY] CustomTarget/odk/odkcommon/configure.pl
[build CPY] CustomTarget/odk/odkcommon/setsdkenv_unix
[build CPY] CustomTarget/odk/odkcommon/setsdkenv_unix.sh.in
cp: cannot create directory 
`/local/home/tinderbox/master/workdir/unxlngx6.pro/CustomTarget/odk/odkcommon/idl/com':
 File exists
[build CPY] CustomTarget/odk/odkcommon/setsdkenv_unix.csh.in
make[1]: *** 
[/local/home/tinderbox/master/workdir/unxlngx6.pro/CustomTarget/odk/odkcommon/idl.offapi.done]
 Error 1
make[1]: *** Waiting for unfinished jobs
make: *** [build] Error 2


Can't cp just copy files which are not there into the directory?
What we are doing there is
mkdir -p CustomTarget/odk/odkcommon/idl
cp -rf udkapi/com CustomTarget/odk/odkcommon/idl
cp -rf offapi/com CustomTarget/odk/odkcommon/idl - fails ?


It might be a race cp doesn't handle gracefully when it sees a dir does 
not yet exist but does already exist when it then tries to create it, as 
those two cp calls above are probably done in parallel.


Stephan

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

Re: The new template manager and document macros

2013-02-28 Thread Niklas Johansson

Some new findings, it seems I was wrong about USE_CONFIG not working it
actually does work, partially. The USE_CONFIG-flag is supposed to show a
security dialog if the security setting is Medium. At least that is how
I interpret
http://api.libreoffice.org/docs/common/ref/com/sun/star/document/MacroExecMode.html#USE_CONFIG.
Besides that issue everything seems OK.

I will try to create a patch that uses USE_CONFIG and hopefully find
some time to see if I can get the flag to work as specified, that task
may very well be way over my head though.

Regards,
Niklas Johansson

Niklas Johansson skrev 2013-02-27 18:53:
Hi, I'm trying to look into an issue with the new template manager.
The new manager doesn't respect macro security settings and always
opens every document with macros disabled. If I've read the code
correctly I believe that the old code used a dispatch to open the
templates while the new implementation uses loadComponentFromURL.

The dispatch service takes care of checking macro security etc while
you need to explicitly tell loadComponentFromURL if macros should be
allowed. I did do a simple test building MacroExcecutionMode set to
USE_CONFIG which didn't really have any effect (probably me messing
something up). Something that did give effect was setting the same
value to ALWAYS_EXECUTE_NO_WARN, but sadly that isn't what we want
either.

Basically I want to know if you think it would be a good idea to go
back to a dispatch type of handling or not. I'm a bit worried that it
might mess with the CMIS integration.

I believe this is the new method that opens templates
http://opengrok.libreoffice.org/xref/core/sfx2/source/doc/templatedlg.cxx#673

I believe this was the method (which also took care of the previewing
templates in the manager)
http://opengrok.libreoffice.org/xref/core/svtools/source/contnr/templwin.cxx#685

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

[Libreoffice-commits] core.git: cui/source

2013-02-28 Thread Markus Mohrhard

 cui/source/dialogs/hltpbase.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit cc9849118fb4e67d1b37f8a69c97fefbcd5db194
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Feb 28 11:24:57 2013 +0100

fix build

diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 1b83736..dfb0037 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -65,7 +65,6 @@ SvxFramesComboBox::SvxFramesComboBox ( Window* pParent, const 
ResId rResId,
 delete pList-at( --i );
 }
 }
-delete pList;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: odk/CustomTarget_idl.mk

 odk/CustomTarget_idl.mk |   19 ---
 1 file changed, 8 insertions(+), 11 deletions(-)

New commits:
commit fb23f10f191b9229fc570c4b38cfc29ca53d5ce7
Author: MatÃºÅ¡ Kukan matus.ku...@gmail.com
Date:   Thu Feb 28 11:06:14 2013 +0100

odk: do not copy to the same place in parallel

Change-Id: I23e26d167b239f4f68ed2c857d2c0a5eaaf1a89c

diff --git a/odk/CustomTarget_idl.mk b/odk/CustomTarget_idl.mk
index a2c38fc..b3ef74e 100644
--- a/odk/CustomTarget_idl.mk
+++ b/odk/CustomTarget_idl.mk
@@ -9,17 +9,14 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/idl))
 
-define odk_idl
-odkcommon_ZIPLIST += $(subst $(SRCDIR)/$(1)/,idl/,$(shell find 
$(SRCDIR)/$(1)/com -type f))
-$(call gb_CustomTarget_get_target,odk/odkcommon/idl) : 
$(odk_WORKDIR)/idl.$(1).done
-$(odk_WORKDIR)/idl.$(1).done :
-   $$(call gb_Output_announce,$$(subst $$(WORKDIR)/,,$$@),build,CPY,1)
-   mkdir -p $(odk_WORKDIR)/idl
-   cp -rf $(SRCDIR)/$(1)/com $(odk_WORKDIR)/idl
-   touch $$@
-
-endef
+odkcommon_ZIPLIST += $(subst $(SRCDIR)/udkapi/,idl/,$(shell find 
$(SRCDIR)/udkapi/com -type f))
+odkcommon_ZIPLIST += $(subst $(SRCDIR)/offapi/,idl/,$(shell find 
$(SRCDIR)/offapi/com -type f))
 
-$(foreach api,udkapi offapi,$(eval $(call odk_idl,$(api
+$(call gb_CustomTarget_get_target,odk/odkcommon/idl) :
+   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CPY,1)
+   mkdir -p $(odk_WORKDIR)/idl
+   cp -rf $(SRCDIR)/udkapi/com $(odk_WORKDIR)/idl
+   cp -rf $(SRCDIR)/offapi/com $(odk_WORKDIR)/idl
+   touch $@
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/generic vcl/unx vcl/win

 vcl/generic/print/genprnpsp.cxx  |7 +++
 vcl/unx/generic/app/randrwrapper.cxx |3 +--
 vcl/unx/generic/gdi/xrender_peer.cxx |2 --
 vcl/unx/generic/printer/cupsmgr.cxx  |4 +---
 vcl/win/source/gdi/salnativewidgets-luna.cxx |2 +-
 5 files changed, 6 insertions(+), 12 deletions(-)

New commits:
commit b5f1139427b40ca727a03e2e41aa5625cfb08bb8
Author: Michael Meeks michael.me...@suse.com
Date:   Wed Feb 27 17:02:38 2013 +

cleanup some module calls.

Change-Id: I2871b7e49416c1fb25b80a7a4e7e2dc98efd75d8

diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index bbd0fc8..f01a7cf 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -103,12 +103,11 @@ static void getPaLib()
 #if defined( UNX )  !( defined( MACOSX ) || defined( IOS )  || defined( 
ANDROID ) )
 if( ! driverLib )
 {
-OUString aLibName( _XSALSET_LIBNAME );
-driverLib   = osl_loadModuleRelative( (oslGenericFunction)getPaLib, 
aLibName.pData, SAL_LOADMODULE_DEFAULT );
+driverLib = osl_loadModuleRelativeAscii( (oslGenericFunction)getPaLib,
+ _XSALSET_LIBNAME,
+ SAL_LOADMODULE_DEFAULT );
 if ( !driverLib )
-{
 return;
-}
 
 pSetupFunction  = (setupFunction)osl_getAsciiFunctionSymbol( 
driverLib, Sal_SetupPrinterDriver );
 if ( !pSetupFunction )
diff --git a/vcl/unx/generic/app/randrwrapper.cxx 
b/vcl/unx/generic/app/randrwrapper.cxx
index f4fae1f..d6667a6 100644
--- a/vcl/unx/generic/app/randrwrapper.cxx
+++ b/vcl/unx/generic/app/randrwrapper.cxx
@@ -148,14 +148,13 @@ RandRWrapper::RandRWrapper( Display* pDisplay ) :
 initFromModule();
 if( ! m_bValid )
 {
-rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( libXrandr.so.2 
) );
 // load and resolve dependencies immediately
 // rationale: there are older distributions where libXrandr.so.2 is 
not linked
 // with libXext.so, resulting in a missing symbol and terminating the 
office
 // obviously they expected libXext to be linked in global symbolspace 
(that is
 // linked by the application), which is not the case with us (because 
we want
 // to be able to run in headless mode even without an installed X11 
library)
-m_pRandRLib = osl_loadModule( aLibName.pData, SAL_LOADMODULE_DEFAULT | 
SAL_LOADMODULE_NOW );
+m_pRandRLib = osl_loadModule( libXrandr.so.2, SAL_LOADMODULE_DEFAULT 
| SAL_LOADMODULE_NOW );
 initFromModule();
 }
 if( m_bValid )
diff --git a/vcl/unx/generic/gdi/xrender_peer.cxx 
b/vcl/unx/generic/gdi/xrender_peer.cxx
index 53855b4..75fb57f 100644
--- a/vcl/unx/generic/gdi/xrender_peer.cxx
+++ b/vcl/unx/generic/gdi/xrender_peer.cxx
@@ -21,8 +21,6 @@
 #include stdio.h
 
 #include rtl/ustring.hxx
-#include osl/module.h
-
 #include unx/salunx.h
 #include unx/saldata.hxx
 #include unx/saldisp.hxx
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx 
b/vcl/unx/generic/printer/cupsmgr.cxx
index a1d8d49..4a4700a 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -870,9 +870,7 @@ bool CUPSManager::addOrRemovePossible() const
 const char* CUPSManager::authenticateUser( const char* /*pIn*/ )
 {
 const char* pRet = NULL;
-
-OUString aLib(_XSALSET_LIBNAME );
-oslModule pLib = osl_loadModule( aLib.pData, SAL_LOADMODULE_LAZY );
+oslModule pLib = osl_loadModuleAscii( _XSALSET_LIBNAME, 
SAL_LOADMODULE_LAZY );
 if( pLib )
 {
 OUString aSym( Sal_authenticateQuery  );
diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx 
b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index 0ec6af1..4ee3f60 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -106,7 +106,7 @@ VisualStylesAPI::VisualStylesAPI()
   lpfnGetThemePartSize( NULL ),
   lpfnIsThemeActive( NULL )
 {
-OUString aLibraryName( RTL_CONSTASCII_USTRINGPARAM( uxtheme.dll ) );
+OUString aLibraryName( uxtheme.dll );
 mhModule = osl_loadModule( aLibraryName.pData, SAL_LOADMODULE_DEFAULT );
 
 if ( mhModule )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Makefile.in solenv/gbuild

 Makefile.in|6 +++---
 solenv/gbuild/partial_build.mk |2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 13bb2310e3ccc500522b1bd8de50e4ecc24074db
Author: MatÃºÅ¡ Kukan matus.ku...@gmail.com
Date:   Thu Feb 28 11:33:12 2013 +0100

fix make module for BUILDDIR  SRCDIR

Change-Id: I63528f351685167c1d67551d92afc2826a8b42ac

diff --git a/Makefile.in b/Makefile.in
index 09788ff..aee4b90 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -66,13 +66,13 @@ define gbuild_module_rules
 .PHONY: $(1) $(1).all $(1).build $(1).check $(1).clean $(1).showdeliverables 
$(1).subsequentcheck
 
 $(1): bootstrap fetch
-   cd $(1)  $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS)
+   cd $(SRCDIR)/$(1)  $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS)
 
 $(1).build $(1).check $(1).clean $(1).showdeliverables:
-   cd $(1)  $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) $$(patsubst 
$(1).%,%,$$@)
+   cd $(SRCDIR)/$(1)  $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) 
$$(patsubst $(1).%,%,$$@)
 
 $(1).subsequentcheck:
-   cd $(1)  $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) 
subsequentcheck
+   cd $(SRCDIR)/$(1)  $(GNUMAKE) -j $(CHECK_PARALLELISM) 
$(GMAKE_OPTIONS) subsequentcheck
 
 $(1).all: bootstrap fetch
$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.build $(WORKDIR)/Module/$(1) $(WORKDIR)/Module/check/$(1) 
$(WORKDIR)/Module/slowcheck/$(1)
diff --git a/solenv/gbuild/partial_build.mk b/solenv/gbuild/partial_build.mk
index 4583ef6..aa7def4 100644
--- a/solenv/gbuild/partial_build.mk
+++ b/solenv/gbuild/partial_build.mk
@@ -1,7 +1,7 @@
-ifeq ($(SOLARENV),)
 ifeq ($(gb_Side),)
 gb_Side:=host
 endif
+ifeq ($(SOLARENV),)
 include $(dir $(realpath $(lastword 
$(MAKEFILE_LIST../../config_$(gb_Side).mk
 endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source

2013-02-28 Thread Olivier Hallot

 cui/source/inc/page.hxx  |5 +
 cui/source/tabpages/page.cxx |   24 ++--
 2 files changed, 19 insertions(+), 10 deletions(-)

New commits:
commit ff27a7fd89dc3786a5f5094ec286ccdb787498bc
Author: Olivier Hallot olivier.hal...@alta.org.br
Date:   Wed Feb 27 22:56:19 2013 -0300

Fix page format UI labels witht mirror pages

The recent page format widget UI was not swapping innerleft and 
outerright labels when page mirroring was selected.

Change-Id: I793180100764293dacb702b725a282a95a6b6238
Reviewed-on: https://gerrit.libreoffice.org/2455
Reviewed-by: Olivier Hallot olivier.hal...@alta.org.br
Tested-by: Olivier Hallot olivier.hal...@alta.org.br

diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index 1049238..64e06de 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -124,6 +124,11 @@ class SvxPageDescPage : public SfxTabPage
 FixedText*   m_pOutsideText;
 FixedText*   m_pPrintRangeQueryText;
 
+OUStringaInsideText;
+OUStringaOutsideText;
+OUStringaLeftText;
+OUStringaRightText;
+
 longnFirstLeftMargin;
 longnFirstRightMargin;
 longnFirstTopMargin;
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 9d32f39..40c109c 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -224,7 +224,9 @@ SvxPageDescPage::SvxPageDescPage( Window* pParent, const 
SfxItemSet rAttr ) :
 get(m_pAdaptBox,checkAdaptBox);
 // Strings stored in UI
 get(m_pInsideText,labelInner);
+aInsideText = m_pInsideText-GetText();
 get(m_pOutsideText,labelOuter);
+aOutsideText = m_pOutsideText-GetText();
 get(m_pPrintRangeQueryText,labelMsg);
 
 bBorderModified = sal_False;
@@ -370,8 +372,8 @@ SvxPageDescPage::~SvxPageDescPage()
 
 void SvxPageDescPage::Init_Impl()
 {
-//aLeftText = m_pLeftMarginLbl-GetText();
-//aRightText = m_pRightMarginLbl-GetText();
+aLeftText = m_pLeftMarginLbl-GetText();
+aRightText = m_pRightMarginLbl-GetText();
 
 // adjust the handler
 m_pLayoutBox-SetSelectHdl( LINK( this, SvxPageDescPage, LayoutHdl_Impl ) 
);
@@ -896,21 +898,23 @@ IMPL_LINK_NOARG(SvxPageDescPage, LayoutHdl_Impl)
 // switch inside outside
 const sal_uInt16 nPos = PosToPageUsage_Impl( 
m_pLayoutBox-GetSelectEntryPos() );
 
+OUString aAux();
+
 if ( nPos == SVX_PAGE_MIRROR )
 {
-if ( m_pLeftMarginLbl-GetText() != m_pInsideText-GetText() )
-m_pLeftMarginLbl-SetText( m_pInsideText-GetText() );
+if ( m_pLeftMarginLbl-GetText() != aInsideText )
+   m_pLeftMarginLbl-SetText( aInsideText );
 
-if ( m_pRightMarginLbl-GetText() != m_pOutsideText-GetText() )
-m_pRightMarginLbl-SetText( m_pOutsideText-GetText() );
+if ( m_pRightMarginLbl-GetText() != aOutsideText )
+m_pRightMarginLbl-SetText( aOutsideText );
 }
 else
 {
-if ( m_pLeftMarginLbl-GetText() != m_pLeftMarginLbl-GetText() )
-m_pLeftMarginLbl-SetText( m_pLeftMarginLbl-GetText() );
+if ( m_pLeftMarginLbl-GetText() != aLeftText )
+m_pLeftMarginLbl-SetText( aLeftText );
 
-if ( m_pRightMarginLbl-GetText() != m_pRightMarginLbl-GetText() )
-m_pRightMarginLbl-SetText( m_pRightMarginLbl-GetText() );
+if ( m_pRightMarginLbl-GetText() != aRightText )
+m_pRightMarginLbl-SetText( aRightText );
 }
 UpdateExample_Impl( true );
 return 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source

2013-02-28 Thread Olivier Hallot

 cui/source/tabpages/page.cxx |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 4777e735640071293c89444516dd9b57d92a39b4
Author: Olivier Hallot olivier.hal...@alta.org.br
Date:   Wed Feb 27 23:25:50 2013 -0300

Remove unused variable

Shuffle some assignments

Change-Id: I054ad7642ed4fcc66ce24923a1c945bedb01ef27
Reviewed-on: https://gerrit.libreoffice.org/2457
Reviewed-by: Olivier Hallot olivier.hal...@alta.org.br
Tested-by: Olivier Hallot olivier.hal...@alta.org.br

diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 40c109c..fe2c43d 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -224,9 +224,7 @@ SvxPageDescPage::SvxPageDescPage( Window* pParent, const 
SfxItemSet rAttr ) :
 get(m_pAdaptBox,checkAdaptBox);
 // Strings stored in UI
 get(m_pInsideText,labelInner);
-aInsideText = m_pInsideText-GetText();
 get(m_pOutsideText,labelOuter);
-aOutsideText = m_pOutsideText-GetText();
 get(m_pPrintRangeQueryText,labelMsg);
 
 bBorderModified = sal_False;
@@ -374,6 +372,8 @@ void SvxPageDescPage::Init_Impl()
 {
 aLeftText = m_pLeftMarginLbl-GetText();
 aRightText = m_pRightMarginLbl-GetText();
+aInsideText = m_pInsideText-GetText();
+aOutsideText = m_pOutsideText-GetText();
 
 // adjust the handler
 m_pLayoutBox-SetSelectHdl( LINK( this, SvxPageDescPage, LayoutHdl_Impl ) 
);
@@ -898,8 +898,6 @@ IMPL_LINK_NOARG(SvxPageDescPage, LayoutHdl_Impl)
 // switch inside outside
 const sal_uInt16 nPos = PosToPageUsage_Impl( 
m_pLayoutBox-GetSelectEntryPos() );
 
-OUString aAux();
-
 if ( nPos == SVX_PAGE_MIRROR )
 {
 if ( m_pLeftMarginLbl-GetText() != aInsideText )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Fix page format UI labels witht mirror pages

2013-02-28 Thread Olivier Hallot (via Code Review)

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/2455

Approvals:
  Olivier Hallot: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I793180100764293dacb702b725a282a95a6b6238
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Olivier Hallot olivier.hal...@alta.org.br
Gerrit-Reviewer: Olivier Hallot olivier.hal...@alta.org.br

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

[PUSHED] Remove unused variable

2013-02-28 Thread Olivier Hallot (via Code Review)

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/2457

Approvals:
  Olivier Hallot: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I054ad7642ed4fcc66ce24923a1c945bedb01ef27
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Olivier Hallot olivier.hal...@alta.org.br
Gerrit-Reviewer: Olivier Hallot olivier.hal...@alta.org.br

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

Re: undefined reference error while build

On Thu, 2013-02-28 at 01:06 +0530, Prashant Pandey wrote:
 Hello everyone,
 
 I am having a hard time debugging the undefined reference to
 some_function error. I made following changes:
 http://pastebin.com/DqqTsP7A. Errors are:
 http://pastebin.com/PW0yzzgA.

Try and send your patches, even ones that are works in progress, as
attachments, rather than pastebin

Anyway... I can't see how you got as far as the linker failure, you
should have gotten a compiler error of no matching function for call to
String::GetToken(... sal_Int32)
which is the problem. You've changed various stuff like..

- xub_StrLen nIndex = 0;
+ sal_Int32 nIndex = 0;
  aFont.SetName( aSearch.GetToken( 0, ';', nIndex ) );

but String::GetToken takes a reference to a 16bit xub_StrLen not a 32bit
sal_Int32. You have to either leaves those inputs to String::GetToken
alone or chage the String to a OUString and use OUString::getToken which
does take a sal_Int32.

I suggest just trying to convert a small piece first rather than making
a mega-patch.

C.

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

[Libreoffice-commits] core.git: vcl/inc vcl/win

2013-02-28 Thread Christian M . Heller

 vcl/inc/vcl/graphicfilter.hxx|   51 +--
 vcl/inc/vcl/prgsbar.hxx  |   43 +++-
 vcl/win/source/window/salobj.cxx |   33 ++---
 3 files changed, 57 insertions(+), 70 deletions(-)

New commits:
commit 02a985013e816c94a07cf93491873fddfe090b1d
Author: Christian M. Heller christian.helle...@gmail.com
Date:   Sun Feb 24 11:30:51 2013 -0500

fdo#39468: Translated German comments in vcl/{inc,win}

Change-Id: I1b11872dd56d93b116a65ac2e3905f751cfafeeb
Signed-off-by: Philipp Riemer ruderphil...@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/2447
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com

diff --git a/vcl/inc/vcl/graphicfilter.hxx b/vcl/inc/vcl/graphicfilter.hxx
index f9a7ae1..3e2218c 100644
--- a/vcl/inc/vcl/graphicfilter.hxx
+++ b/vcl/inc/vcl/graphicfilter.hxx
@@ -87,10 +87,7 @@ struct ConvertData;
 #define EMF_SHORTNAME   EMF
 #define SVG_SHORTNAME   SVG
 
-// 
-// - Info-Klasse fuer alle von uns
-//  unterstuetzten Grafik-Fileformate
-// 
+//  Info class for all supported file formats
 
 #define GFF_NOT ( (sal_uInt16)0x )
 #define GFF_BMP ( (sal_uInt16)0x0001 )
@@ -169,50 +166,48 @@ class VCL_DLLPUBLIC GraphicDescriptor
 
 public:
 
-// Ctor, um einen Filenamen zu setzen. Es muss ::Detect() gerufen werden,
-// um das File zu identifizieren;
-// wenn das File keinen eindeutigen Header besitzt ( Mtf's ) wird das
-// Format anhand der Extension bestimmt
+/** Ctor to set a filename
+
+::Detect() must be called to identify the file
+If the file has no unique header (Mtf's), the format
+is determined from the extension */
 GraphicDescriptor( const INetURLObject rPath );
 
-// Ctor, um einen Stream zu setzen. Es muss ::Detect() gerufen werden,
-// um das File zu identifizieren;
-// da einige Formate ( Mtf's ) keinen eindeutigen Header besitzen,
-// ist es sinnvoll den Filenamen (inkl. Ext. ) mitanzugeben,
-// da so das Format ueber die Extension ermittelt werden kann
+/** Ctor using a stream
+
+::Detect() must be called to identify the file
+As some formats (Mtf's) do not have a unique header, it makes sense
+to supply the file name (incl. ext.), so that the format can be
+derived from the extension */
 GraphicDescriptor( SvStream rInStream, const String* pPath = NULL );
 
-// Dtor
 virtual ~GraphicDescriptor();
 
-// Startet die Detektion;
-// bei bExtendedInfo == sal_True werden soweit wie moeglich
-// Daten aus dem jeweiligen FileHeader ermittelt
-// ( Groesse, Farbtiefe usw. )
+/** starts the detection
+
+if bExtendedInfo == sal_True the file header is used to derive
+as many properties as possible (size, color, etc.) */
 virtual sal_BoolDetect( sal_Bool bExtendedInfo = sal_False );
 
-// liefert das Fileformat nach erfolgreicher  Detektion zurueck;
-// wenn kein Format erkannt wurde, ist das Formart GFF_NOT
+/** @return the file format, GFF_NOT if no format was recognized */
 sal_uInt16  GetFileFormat() const { return nFormat; }
 
-// liefert die Pixel-Bildgroesse oder 0-Size zurueck
+/** @return graphic size in pixels or 0 size */
 const Size GetSizePixel() const { return (Size) aPixSize; }
 
-// liefert die logische Bildgroesse in 1/100mm oder 0-Size zurueck
+/** @return the logical graphic size in 1/100mm or 0 size */
 const Size GetSize_100TH_MM() const { return (Size) aLogSize; }
 
-// liefert die Bits/Pixel oder 0 zurueck
+/** @return bits/pixel or 0 **/
 sal_uInt16  GetBitsPerPixel() const { return nBitsPerPixel; }
 
-// liefert die Anzahl der Planes oder 0 zurueck
+/** return number of planes or 0 */
 sal_uInt16  GetPlanes() const { return nPlanes; }
 
-// zeigt an, ob das Bild evtl. komprimiert (wie auch immer) ist
+/** @return true if the graphic is compressed */
 sal_BoolIsCompressed() const { return bCompressed; }
 
-// gibt die Filternummer des Filters zurueck,
-// der im GraphicFilter zum Lesen dieses Formats
-// benoetigt wird
+/** @return filter number that is needed by the GraphFilter to read this 
format */
 static String GetImportFormatShortName( sal_uInt16 nFormat );
 };
 
diff --git a/vcl/inc/vcl/prgsbar.hxx b/vcl/inc/vcl/prgsbar.hxx
index fb68670..9f22df4 100644
--- a/vcl/inc/vcl/prgsbar.hxx
+++ b/vcl/inc/vcl/prgsbar.hxx
@@ -24,29 +24,26 @@
 #include vcl/window.hxx
 
 /*
-
-Beschreibung
-
-
-class ProgressBar
-
-Diese Klasse dient zur Anzeige einer Progress-Anzeige.
-
---

[PUSHED] fdo#39468: Translated German comments in vcl/{inc,win}

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/2447

Approvals:
  Philipp Riemer: Looks good to me, but someone else must approve
  Michael Meeks: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1b11872dd56d93b116a65ac2e3905f751cfafeeb
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Philipp Riemer ruderphil...@gmail.com
Gerrit-Reviewer: Christian M. Heller christian.helle...@gmail.com
Gerrit-Reviewer: Michael Meeks michael.me...@suse.com
Gerrit-Reviewer: Philipp Riemer ruderphil...@gmail.com

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

[Libreoffice-commits] core.git: icu/ExternalProject_icu.mk

 icu/ExternalProject_icu.mk |   18 ++
 1 file changed, 10 insertions(+), 8 deletions(-)

New commits:
commit bc3170b4c15e8287e990fb9ae9c74241345038dc
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Feb 28 10:26:27 2013 +

use our default opt/noopt and symbol flags with icu

so --enable-symbols gets -g in here with -O2

for gcc always add -fno-strict-aliasing

Change-Id: I8d673ebaf26d5afdcc5ae5de626cc7f32ffd6835

diff --git a/icu/ExternalProject_icu.mk b/icu/ExternalProject_icu.mk
index 71d6cba..610b510 100644
--- a/icu/ExternalProject_icu.mk
+++ b/icu/ExternalProject_icu.mk
@@ -48,15 +48,17 @@ endif
 
 else # $(OS)
 
-icu_CFLAGS:=$(if $(filter ANDROID,$(OS)),-fvisibility=hidden 
-fno-omit-frame-pointer) \
-   $(if $(filter IOS,$(OS)),-DUCONFIG_NO_FILE_IO) \
+icu_CFLAGS:=$(if $(filter IOS,$(OS)),-DUCONFIG_NO_FILE_IO) \
$(if $(SYSBASE),-I$(SYSBASE)/usr/include) \
-   $(if $(debug),-g,\
-   $(if $(filter GCC,$(COM)),-O2 -fno-strict-aliasing,-O))
-icu_CXXFLAGS:=$(if $(filter ANDROID,$(OS)),-fvisibility=hidden 
-fno-omit-frame-pointer) \
-   $(if $(filter IOS,$(OS)),-DUCONFIG_NO_FILE_IO) \
-   $(if $(debug),-g,\
-   $(if $(filter GCC,$(COM)),-O2 -fno-strict-aliasing,-O))
+   $(if $(debug),$(gb_DEBUG_CFLAGS),$(gb_COMPILEROPTFLAGS)) \
+   $(if $(filter GCC,$(COM)),-fno-strict-aliasing) \
+   $(if $(filter $(true),$(gb_SYMBOL)),-g) \
+   $(if $(filter ANDROID,$(OS)),-fvisibility=hidden 
-fno-omit-frame-pointer)
+icu_CXXFLAGS:=$(if $(filter IOS,$(OS)),-DUCONFIG_NO_FILE_IO) \
+   $(if $(debug),$(gb_DEBUG_CFLAGS),$(gb_COMPILEROPTFLAGS)) \
+   $(if $(filter GCC,$(COM)),-fno-strict-aliasing) \
+   $(if $(filter $(true),$(gb_SYMBOL)),-g) \
+   $(if $(filter ANDROID,$(OS)),-fvisibility=hidden 
-fno-omit-frame-pointer)
 icu_LDFLAGS:=$(if $(filter 
TRUE,$(HAVE_LD_HASH_STYLE)),-Wl$(COMMA)--hash-style=$(WITH_LINKER_HASH_STYLE)) \
$(if $(SYSBASE),-L../lib -L../../lib -L../stubdata -L../../stubdata 
-L$(SYSBASE)/usr/lib) \
$(if $(filter TRUE,$(HAVE_LD_BSYMBOLIC_FUNCTIONS)),\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 7 commits - helpcompiler/inc helpcompiler/source solenv/gbuild

2013-02-28 Thread David Tardon

 helpcompiler/inc/HelpLinker.hxx|2 
 helpcompiler/source/HelpLinker.cxx |5 +
 solenv/gbuild/AllLangHelp.mk   |   15 +++-
 solenv/gbuild/HelpTarget.mk|  136 +
 solenv/gbuild/TargetLocations.mk   |6 -
 5 files changed, 102 insertions(+), 62 deletions(-)

New commits:
commit f27954d5bfb0ad4b69482f26d30a6224aa1f5568
Author: David Tardon dtar...@redhat.com
Date:   Thu Feb 28 12:26:02 2013 +0100

remove superfluous target

Change-Id: I8efd522b6317922f091269b1c857efdb2d05dd56

diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk
index 26ef28b..50961a2 100644
--- a/solenv/gbuild/HelpTarget.mk
+++ b/solenv/gbuild/HelpTarget.mk
@@ -295,17 +295,10 @@ $(dir $(call gb_HelpLinkTarget_get_target,%))%/.dir :
 $(call gb_HelpLinkTarget_get_target,%) : $(gb_HelpLinkTarget_DEPS)
$(call gb_HelpLinkTarget__command,$@,$*)
 
-$(call gb_HelpLinkTarget_get_preparation_target,%) :
-   touch $@
-
 .PHONY : $(call gb_HelpLinkTarget_get_clean_target,%)
 $(call gb_HelpLinkTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),HLK,3)
-   $(call gb_Helper_abbreviate_dirs,\
-   rm -f \
-   $(call gb_HelpLinkTarget_get_target,$*) \
-   $(call gb_HelpLinkTarget_get_preparation_target,$*) \
-   )
+   rm -f $(call gb_HelpLinkTarget_get_target,$*)
 
 # Create a help linking target.
 #
@@ -323,9 +316,7 @@ $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_SRCDIR :=
 $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_TREE :=
 $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_WORKDIR := $(4)
 
-$(call gb_HelpLinkTarget_get_target,$(1)) : $(call 
gb_HelpLinkTarget_get_preparation_target,$(1))
 $(call gb_HelpLinkTarget_get_target,$(1)) :| $(dir $(call 
gb_HelpLinkTarget_get_target,$(1))).dir
-$(call gb_HelpLinkTarget_get_preparation_target,$(1)) :| $(dir $(call 
gb_HelpLinkTarget_get_preparation_target,$(1))).dir
 
 endef
 
@@ -569,7 +560,7 @@ $(call 
gb_HelpIndexTarget_HelpIndexTarget,$(1),$(2),$(3),$(4))
 $(call gb_HelpJarTarget_HelpJarTarget,$(1),$(2),$(4))
 
 $(call gb_HelpTarget_get_linked_target,$(1)) : $(call 
gb_HelpTarget_get_translation_target,$(1))
-$(call gb_HelpLinkTarget_get_preparation_target,$(1)) : $(call 
gb_HelpTarget_get_linked_target,$(1))
+$(call gb_HelpLinkTarget_get_target,$(1)) : $(call 
gb_HelpTarget_get_linked_target,$(1))
 $(call gb_HelpLinkTarget_get_target,$(1)) :| $(call 
gb_HelpTarget_get_workdir,$(1))/.dir
 $(call gb_HelpTarget_get_target,$(1)) : $(call 
gb_HelpLinkTarget_get_target,$(1))
 
commit 9e3dcc233b3bf3e259e1418c061576d2d0b9f394
Author: David Tardon dtar...@redhat.com
Date:   Thu Feb 28 12:23:41 2013 +0100

remove superfluous target

Change-Id: Idbb67a2cb79f8eb4f8cf5834217bb0c900a978a6

diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk
index 4bc077c..26ef28b 100644
--- a/solenv/gbuild/HelpTarget.mk
+++ b/solenv/gbuild/HelpTarget.mk
@@ -534,17 +534,12 @@ $(call gb_HelpTarget_get_linked_target,%) :
 $(call gb_HelpTarget_get_target,%) :
$(call gb_HelpTarget__get_command,$@,$*)
 
-# All processing is done and the results can be packed into a zip.
-$(call gb_HelpTarget_get_packing_target,%) :
-   touch $@
-
 .PHONY : $(call gb_HelpTarget_get_clean_target,%)
 $(call gb_HelpTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),HLP,4)
$(call gb_Helper_abbreviate_dirs,\
rm -rf \
$(call gb_HelpTarget_get_linked_target,$*) \
-   $(call gb_HelpTarget_get_packing_target,$*) \
$(call gb_HelpTarget_get_target,$*) \
$(call gb_HelpTarget_get_translation_target,$*) \
$(call gb_HelpTarget_get_workdir,$*) \
@@ -576,11 +571,9 @@ $(call gb_HelpJarTarget_HelpJarTarget,$(1),$(2),$(4))
 $(call gb_HelpTarget_get_linked_target,$(1)) : $(call 
gb_HelpTarget_get_translation_target,$(1))
 $(call gb_HelpLinkTarget_get_preparation_target,$(1)) : $(call 
gb_HelpTarget_get_linked_target,$(1))
 $(call gb_HelpLinkTarget_get_target,$(1)) :| $(call 
gb_HelpTarget_get_workdir,$(1))/.dir
-$(call gb_HelpTarget_get_packing_target,$(1)) : $(call 
gb_HelpLinkTarget_get_target,$(1))
-$(call gb_HelpTarget_get_target,$(1)) : $(call 
gb_HelpTarget_get_packing_target,$(1))
+$(call gb_HelpTarget_get_target,$(1)) : $(call 
gb_HelpLinkTarget_get_target,$(1))
 
 $(call gb_HelpTarget_get_linked_target,$(1)) :| $(dir $(call 
gb_HelpTarget_get_linked_target,$(1))).dir
-$(call gb_HelpTarget_get_packing_target,$(1)) :| $(dir $(call 
gb_HelpTarget_get_packing_target,$(1))).dir
 $(call gb_HelpTarget_get_target,$(1)) :| $(dir $(call 
gb_HelpTarget_get_target,$(1))).dir
 $(call gb_HelpTarget_get_translation_target,$(1)) :| $(dir $(call 
gb_HelpTarget_get_translation_target,$(1))).dir
 
@@ -653,7 +646,7 @@ $(call gb_HelpTarget__add_index_files,$(1),$(call

[Libreoffice-commits] core.git: helpcontent2

2013-02-28 Thread David Tardon

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bfdbdd5359fc3a8471c46263c0f05ae0979b0c56
Author: David Tardon dtar...@redhat.com
Date:   Thu Feb 28 09:23:37 2013 +0100

Updated core
Project: help  dd64dc0f137c28c8889c525adf3eb26caab38db5

diff --git a/helpcontent2 b/helpcontent2
index 280514d..dd64dc0 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 280514d881bb3bd272120e54d776025addcd2a35
+Subproject commit dd64dc0f137c28c8889c525adf3eb26caab38db5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: AllLangHelp_shared.mk

2013-02-28 Thread David Tardon

 AllLangHelp_shared.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit dd64dc0f137c28c8889c525adf3eb26caab38db5
Author: David Tardon dtar...@redhat.com
Date:   Thu Feb 28 09:23:37 2013 +0100

add err.html to shared help module

Change-Id: I39ebb1bb238c83e26300db95d242b2863b63aa2d

diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index cb05e29..5b61e5a 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -28,7 +28,8 @@ $(eval $(call 
gb_AllLangHelp_add_localized_files,shared,helpcontent2/source/auxi
highcontrastwhite.css \
 ))
 
-# TODO: handle err_html.xhp - err.html
+$(eval $(call 
gb_AllLangHelp_add_helpdir_file,shared,err.html,helpcontent2/source/text/shared/05/err_html))
+
 $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 helpcontent2/source/text/shared/00/0001 \
 helpcontent2/source/text/shared/00/0002 \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: SfxItemSet::Put(..., USHORT nWhich) removal (was the meaning of core/starmath/sdi/smath.sdi)

On Thu, 2013-02-21 at 10:01 +0100, Maciej Rumianowski wrote:
 Hi *,
 
 does someone know what is the meaning of this
 (http://opengrok.libreoffice.org/xref/core/starmath/sdi/smath.sdi)
 file?
 It uses a lot of SfxVoidItem which I am currently investigating and
 trying to use as DisabledItem mark.

btw, what effect do you want to achieve ?

 http://cgit.freedesktop.org/libreoffice/core/tree/svl/source/items/itemset.cxx
 void SfxItemSet::DisableItem(sal_uInt16 nWhich)
 {
 DBG_CHKTHIS(SfxItemSet, 0);
 Put( SfxVoidItem(0), nWhich );
 }
 Because of Bug 34465 Items should be inserted at same nWhich as
 their .Which().

caolanm-bjoern: what's the vision around SfxItemSet::DisableItem and
removal of the two argument SfxItemSet::Put ?

C.


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

Re: are the New Graphic Compress features accessable for API

On Sun, 2013-02-24 at 13:49 +0100, Fernand Vanrie wrote:
 Tomaž Vajngerl made new Graphic Compress tools, they are sinds 4.0 
 available using the GUI and the new Compress Graphics Dialog in Draw, 
 Calc and Impress.
 
 1: Can this features been accessed using the API and Basic ?
 
 2: Is the new Lanczos Interpolation also available when using The 
 Graphic Profider to export a Graphic ?

I sort of doubt its accessible via UNO (but maybe I'm wrong), unless
Tomaž has future plans around that ?

C.

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

[PATCH libreoffice-4-0] Resolves: fdo#61571 cairo not linking against internal libpn...

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2462

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/62/2462/1

Resolves: fdo#61571 cairo not linking against internal libpng

the flag is called SYSTEM_LIBPNG not SYSTEM_PNG

Change-Id: I703a669f544e539f7fcfa64c0121a73f0608aecc
(cherry picked from commit c0f85e6879e527ff0673c82e84e8ee0afcc6a5ec)
---
M cairo/ExternalProject_cairo.mk
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/cairo/ExternalProject_cairo.mk b/cairo/ExternalProject_cairo.mk
index 54a220b..de3994f 100644
--- a/cairo/ExternalProject_cairo.mk
+++ b/cairo/ExternalProject_cairo.mk
@@ -40,7 +40,7 @@
pixman_LIBS=-L$(call 
gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1 \
COMPRESS=$(if $(filter YES,$(SYSTEM_ZLIB)),compress,z_compress) 
\
ZLIB3RDLIB=-lz \
-   $(if $(filter 
NO,$(SYSTEM_PNG)),png_CFLAGS=-I$(OUTDIR)/inc/external/libpng 
png_LIBS=-L$(OUTDIR)/lib -lpng) \
+   $(if $(filter 
NO,$(SYSTEM_LIBPNG)),png_CFLAGS=-I$(OUTDIR)/inc/external/libpng 
png_LIBS=-L$(OUTDIR)/lib -lpng) \
$(if $(filter IOS,$(OS)),--disable-shared,--disable-static) \
$(if $(filter ANDROID IOS,$(OS)),--disable-xlib,--enable-xlib) \
$(if $(filter IOS,$(OS)),--enable-quartz --enable-quartz-font) \

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I703a669f544e539f7fcfa64c0121a73f0608aecc
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Caolán McNamara caol...@redhat.com

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

[PUSHED] fdo#39468: Translate German comments in sd/source/core/

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/2461

Approvals:
  Michael Meeks: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I91af80438dff2aead6bf32cecd3caa97e05c9a65
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Stefan Knorr heinzless...@gmail.com
Gerrit-Reviewer: Michael Meeks michael.me...@suse.com
Gerrit-Reviewer: Philipp Riemer ruderphil...@gmail.com

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

Re: Cppcheck reports 'nMaxWidth' is assigned a value never used (svtools module)

On Tue, 2013-02-12 at 08:13 -0800, julien2412 wrote:
 544 if( nMaxWidth  aSize.Width() )
 545 {
 546 Size aDlgSize = GetPathDialog()-GetOutputSizePixel();
 547 GetPathDialog()-SetOutputSizePixel( Size(
 aDlgSize.Width()+nMaxWidth-aSize.Width(), aDlgSize.Height() ) );
 548 aSize.Width() = nMaxWidth;
 549 
 550 if( pOkBtn )
 551 pOkBtn-SetSizePixel( aSize );
 552 if( pCancelBtn )
 553 pCancelBtn-SetSizePixel( aSize );
 554 if( pLoadBtn )
 555 pLoadBtn-SetSizePixel( aSize );
 556 }
 557 else
 558 nMaxWidth = aSize.Width();
 
 see
 http://opengrok.libreoffice.org/xref/core/svtools/source/dialogs/filedlg2.cxx#544
 
 Any idea what should be done with this?

It's another been like this since day 0, go ahead and remove the
does-nothing else branch. (The exciting manual move of widgets around
and determination of the size etc can all eventually go if it gets
converted to the widget layout stuff)

 I noticed these lines in tools/inc/tools/gen.hxx:
 longWidth() const  { return nA; }
 longWidth() const  { return nA; }
 I must recognize I don't understand the interest since there's a setWidth
 function

and setWidth just calls the second Width() variant. I can only speculate
it was an ancient abandoned incremental cleanup effort to remove one or
the other.

C.

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

Re: SfxItemSet::Put(..., USHORT nWhich) removal (was the meaning of core/starmath/sdi/smath.sdi)

2013-02-28 Thread Bjoern Michaelsen

On Thu, Feb 28, 2013 at 11:34:24AM +, Caolán McNamara wrote:
 caolanm-bjoern: what's the vision around SfxItemSet::DisableItem and
 removal of the two argument SfxItemSet::Put ?

Both tie the interface of the class to the implementation. If one wants to
replace the SfxItemSet someday with some same standard container internally,
these two are the first to go.
Also: The two argument SfxItemSet::Put allows you to put an item at WhichId
slot that is different from the WhichId the SfxPoolItem has stored internally,
thus following the principle of most surprise. This is e.g. done in editeng
quite a lot. I expect quite a few obscure bugs will be created by this
implementation detail ... wait, let me rephrase that: I expect quite a few
obscure bugs already existing because of this. ;)

Best,

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

Re: Need help for BUg 42893- Improve 'Capitalize first letter of sentence'

On Thu, 2013-02-21 at 22:12 +0530, Janit Anjaria wrote:
 Hey!
 
 
 I followed the guidelines and tried to work this out as:
 if( 2  ( pStr - pStart ) )
  return sal_False;

Can you make sure to keep libreoffice@lists.freedesktop.org in the CC
please, that way a question that someone else might need the answer to
only needs to be answered once.

 //Here x is a temporary pointer at the end of the string which is
 taken down uptil the last fullstop(i.e. the place after which the
 capitalisation has to be verified)

I'm having a hard time understanding the pseudo code out of context of
the existing code. Can you just attach a patch of what you are trying.

 
 loop:   
 
  while(!IsWordDelim(*pStr))
 {
 x--;
 }
 
 if(pStr[x]=='.')
 {
 if(pStr[x-2]=='.')
 return sal_False;
 }
 
 else 
 
 { go to loop;}
 
 if( !rCC.isLetterNumeric(
  aText, sal::static_int_cast xub_StrLen ( pStr-- - pStart ) ) )
  {


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

Re: Developer Input - FDO#30671 - slide transitions appears to use GL_DOUBLE vertices

On Mon, 2012-10-15 at 11:20 -0700, Joel Madero wrote:
 This is one of our oldest unconfirmed bugs (2 years!). I think we need
 developer input on it as it's not clear if the user's point has any
 real impact on the project. Can one of you check it out and let me
 know if we can close it or move it forward as a confirmed bug (seems
 more like enhancement though)

Meh, lets give up on it, closed/wontfix. Presumably converting from
double to float just at the point of insertion into opengl gains
nothing, and e.g. reworking B2DTuple and friends to floats seems
impracticable.

C. 

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - i18npool/source

 i18npool/source/textconversion/data/stc_char.dic |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 1a562d8f7acd2d0e90eef4b6fdee2c57724203cb
Author: Andras Timar ati...@suse.com
Date:   Thu Feb 28 08:41:15 2013 +0100

fdo#57536 remove ç:è, because it is wrong is some cases

Change-Id: Ia7c5692e1da4d24d985f0813e07631898d7100ce
Reviewed-on: https://gerrit.libreoffice.org/2459
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/i18npool/source/textconversion/data/stc_char.dic 
b/i18npool/source/textconversion/data/stc_char.dic
index 92a06f2..5f06fa7 100644
--- a/i18npool/source/textconversion/data/stc_char.dic
+++ b/i18npool/source/textconversion/data/stc_char.dic
@@ -1179,7 +1179,6 @@
 ç¯:çç¯
 çº:çºè¦
 ç¬:ç
-ç:è
 ç:ç
 ç:ç
 ç:ç¼
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-0] fdo#57536 remove 着:著, because it is wrong is some cases

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/2459

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia7c5692e1da4d24d985f0813e07631898d7100ce
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Andras Timar ati...@suse.com
Gerrit-Reviewer: Caolán McNamara caol...@redhat.com

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

[Libreoffice-commits] core.git: crashrep/source crashrep/WinResTarget_crashrep.mk desktop/util desktop/win32 desktop/WinResTarget_sbase.mk desktop/WinResTarget_scalc.mk desktop/WinResTarget_sdraw.mk d

 crashrep/WinResTarget_crashrep.mk|5 -
 crashrep/source/win32/rcheader.txt   |   15 ---
 desktop/WinResTarget_sbase.mk|1 +
 desktop/WinResTarget_scalc.mk|1 +
 desktop/WinResTarget_sdraw.mk|1 +
 desktop/WinResTarget_simpress.mk |1 +
 desktop/WinResTarget_smath.mk|1 +
 desktop/WinResTarget_soffice.mk  |1 +
 desktop/WinResTarget_sofficebin.mk   |1 +
 desktop/WinResTarget_sweb.mk |1 +
 desktop/WinResTarget_swriter.mk  |1 +
 desktop/util/officeloader.rc |2 +-
 desktop/win32/source/applauncher/launcher.rc |2 +-
 scp2/source/base/file_base.scp   |5 -
 scp2/source/calc/file_calc.scp   |5 -
 scp2/source/crashrep/file_crashrep.scp   |5 -
 scp2/source/draw/file_draw.scp   |5 -
 scp2/source/impress/file_impress.scp |5 -
 scp2/source/math/file_math.scp   |5 -
 scp2/source/ooo/common_brand.scp |8 
 scp2/source/writer/file_writer.scp   |8 +---
 21 files changed, 24 insertions(+), 55 deletions(-)

New commits:
commit 6851c5fd4337af38884d16c05695da7e4e059dcc
Author: Andras Timar ati...@suse.com
Date:   Thu Feb 28 13:17:39 2013 +0100

bin PATCH_SO_NAME crack

In VersionInfo of Windows executables the FileDescription property 
originally contained
80 times 'x' character. These executables were marked as PATCH_SO_NAME and 
later the
installer maker perl program replaced the xxx to the actual file 
description
which was defined in scp2. WHy was it good, I have no idea. The problem was 
that it
happened after postprocess, where we signed the binaries, thus diigital 
signature became
corrupted. It is better to give file descriptions via makefiles.

Change-Id: Id5ad4470bb7a6313b33fbba09d72d9a009163a89

diff --git a/crashrep/WinResTarget_crashrep.mk 
b/crashrep/WinResTarget_crashrep.mk
index 6206dc7..6036157 100644
--- a/crashrep/WinResTarget_crashrep.mk
+++ b/crashrep/WinResTarget_crashrep.mk
@@ -14,7 +14,10 @@ $(eval $(call gb_WinResTarget_use_custom_headers,crashrep,\
 ))
 
 $(eval $(call gb_WinResTarget_add_defs,crashrep,\
-   -DVERVARIANT=$(BUILD) \
+-DRES_APP_NAME=crashrep \
+-DRES_APP_FILEDESC=$(PRODUCTNAME) Crashreporter \
+-DVERVARIANT=$(BUILD) \
+-DRES_APP_VENDOR=$(OOO_VENDOR) \
 ))
 
 $(eval $(call 
gb_WinResTarget_set_rcfile,crashrep,crashrep/source/win32/crashrep))
diff --git a/crashrep/source/win32/rcheader.txt 
b/crashrep/source/win32/rcheader.txt
index be3c060..bace84b 100644
--- a/crashrep/source/win32/rcheader.txt
+++ b/crashrep/source/win32/rcheader.txt
@@ -58,13 +58,14 @@ VS_VERSION_INFO versioninfo
block 040904E4
{
// International StringTable
-   value CompanyName,The Document 
Foundation\0
-   value FileDescription,
\0
-   value FileVersion,PPS(VER_LEVEL) 
\0
-   value ProductVersion, PPS(VER_LEVEL) 
\0
-   value OriginalFilename,   SOREPORT.EXE\0
-   value InternalName,   CrashReport\0
-   value LegalCopyright, S_CRIGHT  
LibreOffice contributors and/or their affiliates. All rights reserved.\0
+VALUE CompanyName,  PPS(RES_APP_VENDOR) \0
+VALUE FileDescription,  PPS(RES_APP_FILEDESC) \0
+VALUE FileVersion,  PPS(VER_LEVEL) \0
+VALUE ProductVersion,   PPS(VER_LEVEL) \0
+VALUE ProductName,  LibreOffice\0
+VALUE OriginalFilename, PPS(RES_APP_NAME) .exe\0
+VALUE InternalName, PPS(RES_APP_NAME) \0
+VALUE LegalCopyright,   S_CRIGHT  LibreOffice contributors 
and/or their affiliates. All rights reserved.\0
}
}
 
diff --git a/desktop/WinResTarget_sbase.mk b/desktop/WinResTarget_sbase.mk
index 008e436..f4f49d4 100644
--- a/desktop/WinResTarget_sbase.mk
+++ b/desktop/WinResTarget_sbase.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_WinResTarget_set_include,sbase/src,\
 
 $(eval $(call gb_WinResTarget_add_defs,sbase/src,\
 -DRES_APP_NAME=sbase \
+-DRES_APP_FILEDESC=$(PRODUCTNAME) Base \
 -DRES_APP_ICON=icons/base_app.ico \
 -DVERVARIANT=$(BUILD) \
 -DRES_APP_VENDOR=$(OOO_VENDOR) \
diff --git a/desktop/WinResTarget_scalc.mk b/desktop/WinResTarget_scalc.mk
index 89a2d2d..8781d0d 100644
--- a/desktop/WinResTarget_scalc.mk
+++ b/desktop/WinResTarget_scalc.mk
@@ -34,6 +34,7 @@ $(eval $(call

[Libreoffice-commits] core.git: 3 commits - config_host/config_udkversion.h.in config_host/.gitignore config_host/udkversion.mk.in configure.ac odk/Module_odk.mk odk/settings registry/inc sal/ZipPacka

2013-02-28 Thread Stephan Bergmann

 config_host/.gitignore |1 -
 config_host/config_udkversion.h.in |   14 --
 config_host/udkversion.mk.in   |6 --
 configure.ac   |   15 +--
 odk/Module_odk.mk  |3 ---
 odk/settings/settings.mk   |   12 
 registry/inc/registry/regtype.h|5 -
 sal/ZipPackage_sal_generated.mk|4 
 8 files changed, 1 insertion(+), 59 deletions(-)

New commits:
commit bfdcde7c2eb44b7c342ba1d048384eb7776808ae
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Feb 28 09:05:18 2013 +0100

Unused UDK_MAJOR/MINOR/MICRO macros (and udkversion.mk), also removed from 
SDK

Change-Id: I466424c5b71de4d6bb126499895539813283502a

diff --git a/config_host/.gitignore b/config_host/.gitignore
index e62c650..9becb5b 100644
--- a/config_host/.gitignore
+++ b/config_host/.gitignore
@@ -1,2 +1 @@
 config_*.h
-udkversion.mk
diff --git a/config_host/udkversion.mk.in b/config_host/udkversion.mk.in
deleted file mode 100644
index 7bd445f..000
--- a/config_host/udkversion.mk.in
+++ /dev/null
@@ -1,6 +0,0 @@
-# UDK version number
-
-UDK_MAJOR=@UDK_MAJOR@
-UDK_MINOR=@UDK_MINOR@
-UDK_MICRO=@UDK_MICRO@
-
diff --git a/configure.ac b/configure.ac
index 047337a..c4c221c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4108,7 +4108,6 @@ if test $cross_compiling = yes; then
 cp config.log ../config.Build.log
 mkdir -p ../config_build
 cp config_host/*.h ../config_build
-cp config_host/udkversion.mk ../config_build
 . ./bin/get_config_variables COM GUI OS PATH CPU CPUNAME CC CXX 
DISABLE_PYTHON MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH PYTHON SYSTEM_LIBXSLT 
OUTDIR SOLARINC SOLARLIB WORKDIR
 
 for V in COM GUI OS CPU CPUNAME CC CXX DISABLE_PYTHON 
MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH \
@@ -4178,14 +4177,6 @@ dnl 
===
 dnl Our version is defined by the AC_INIT() at the top of this script.
 dnl ===
 
-UDK_MAJOR=3
-UDK_MINOR=2
-UDK_MICRO=7
-
-AC_SUBST(UDK_MAJOR)
-AC_SUBST(UDK_MINOR)
-AC_SUBST(UDK_MICRO)
-
 set `echo AC_PACKAGE_VERSION | sed s/\./ /g`
 
 LIBO_VERSION_MAJOR=$1
@@ -11837,7 +11828,7 @@ if test -f config_host.mk; then
 config_md5=`$MD5SUM config_host.mk | sed s/ .*//`
 fi
 
-AC_CONFIG_FILES([config_host.mk Makefile lo.xcent solenv/inc/minor.mk 
config_host/udkversion.mk instsetoo_native/util/openoffice.lst])
+AC_CONFIG_FILES([config_host.mk Makefile lo.xcent solenv/inc/minor.mk 
instsetoo_native/util/openoffice.lst])
 AC_CONFIG_HEADERS([config_host/config_clang.h])
 AC_CONFIG_HEADERS([config_host/config_global.h])
 AC_CONFIG_HEADERS([config_host/config_graphite.h])
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index be1ec1e..c66e1dd 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -9,9 +9,6 @@
 
 $(eval $(call gb_Module_Module,odk))
 
-# needed in several makefiles here
-include $(BUILDDIR)/config_host/udkversion.mk
-
 $(eval $(call gb_Module_add_targets,odk,\
CustomTarget_odkcommon \
$(if $(filter WNT,$(OS)),CustomTarget_cli) \
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index eecde50..58abdd5 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -193,9 +193,6 @@ URLPREFIX=file://
 COMID=gcc3
 CPPU_ENV=gcc3
 
-# Include UDK version numbers
-include $(PRJ)/include/udkversion.mk
-
 #SALLIB=-luno_sal
 #CPPULIB=-luno_cppu
 #CPPUHELPERLIB=-luno_cppuhelperC52
@@ -326,9 +323,6 @@ DELRECURSIVE=rm -rf
 COPY=cp
 URLPREFIX=file://
 
-# Include UDK version numbers
-include $(PRJ)/include/udkversion.mk
-
 SALLIB=-luno_sal
 CPPULIB=-luno_cppu
 CPPUHELPERLIB=-luno_cppuhelper$(COMID)
@@ -438,9 +432,6 @@ DELRECURSIVE=rm -rf
 COPY=cp
 URLPREFIX=file://
 
-# Include UDK version numbers
-include $(PRJ)/include/udkversion.mk
-
 SALLIB=-luno_sal
 CPPULIB=-luno_cppu
 CPPUHELPERLIB=-luno_cppuhelper$(COMID)
@@ -561,9 +552,6 @@ DELRECURSIVE=rm -rf
 COPY=cp
 URLPREFIX=file://
 
-# Include UDK version numbers
-include $(PRJ)/include/udkversion.mk
-
 SALLIB=-luno_sal
 CPPULIB=-luno_cppu
 CPPUHELPERLIB=-luno_cppuhelper$(COMID)
diff --git a/sal/ZipPackage_sal_generated.mk b/sal/ZipPackage_sal_generated.mk
index c741cbc..0cd7442 100644
--- a/sal/ZipPackage_sal_generated.mk
+++ b/sal/ZipPackage_sal_generated.mk
@@ -27,8 +27,6 @@
 
 $(eval $(call 
gb_ZipPackage_ZipPackage,sal_generated,$(BUILDDIR)/config_$(gb_Side)))
 
-$(eval $(call 
gb_ZipPackage_add_file,sal_generated,inc/udkversion.mk,include/udkversion.mk,udkversion.mk))
-
 $(eval $(call 
gb_ZipPackage_add_file,sal_generated,inc/sal/typesizes.h,include/sal/typesizes.h,config_typesizes.h))
 
 # vim: set noet sw=4 ts=4:
commit 8546e4180d0ea21af2033bf5888e16e3018a764e
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Feb 28 08:52:07 2013 +0100

Unused SAL_UDK_MAJOR/MINOR/MICRO macros (unused sal/udkversion.h)

Change-Id:

[PATCH libreoffice-4-0] bin PATCH_SO_NAME crack

2013-02-28 Thread Andras Timar (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2463

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/63/2463/1

bin PATCH_SO_NAME crack

In VersionInfo of Windows executables the FileDescription property originally 
contained
80 times 'x' character. These executables were marked as PATCH_SO_NAME and 
later the
installer maker perl program replaced the xxx to the actual file 
description
which was defined in scp2. WHy was it good, I have no idea. The problem was 
that it
happened after postprocess, where we signed the binaries, thus diigital 
signature became
corrupted. It is better to give file descriptions via makefiles.

Conflicts:

crashrep/WinResTarget_crashrep.mk

Oh, well, crashrep is a dmake module in 4.0. But it is not built, so patch has 
no
effect in practice.

Change-Id: Id5ad4470bb7a6313b33fbba09d72d9a009163a89
---
M crashrep/source/win32/rcheader.txt
M desktop/WinResTarget_sbase.mk
M desktop/WinResTarget_scalc.mk
M desktop/WinResTarget_sdraw.mk
M desktop/WinResTarget_simpress.mk
M desktop/WinResTarget_smath.mk
M desktop/WinResTarget_soffice.mk
M desktop/WinResTarget_sofficebin.mk
M desktop/WinResTarget_sweb.mk
M desktop/WinResTarget_swriter.mk
M desktop/util/officeloader.rc
M desktop/win32/source/applauncher/launcher.rc
M scp2/source/base/file_base.scp
M scp2/source/calc/file_calc.scp
M scp2/source/crashrep/file_crashrep.scp
M scp2/source/draw/file_draw.scp
M scp2/source/impress/file_impress.scp
M scp2/source/math/file_math.scp
M scp2/source/ooo/common_brand.scp
M scp2/source/writer/file_writer.scp
20 files changed, 20 insertions(+), 54 deletions(-)



diff --git a/crashrep/source/win32/rcheader.txt 
b/crashrep/source/win32/rcheader.txt
index be3c060..bace84b 100644
--- a/crashrep/source/win32/rcheader.txt
+++ b/crashrep/source/win32/rcheader.txt
@@ -58,13 +58,14 @@
block 040904E4
{
// International StringTable
-   value CompanyName,The Document 
Foundation\0
-   value FileDescription,
\0
-   value FileVersion,PPS(VER_LEVEL) 
\0
-   value ProductVersion, PPS(VER_LEVEL) 
\0
-   value OriginalFilename,   SOREPORT.EXE\0
-   value InternalName,   CrashReport\0
-   value LegalCopyright, S_CRIGHT  
LibreOffice contributors and/or their affiliates. All rights reserved.\0
+VALUE CompanyName,  PPS(RES_APP_VENDOR) \0
+VALUE FileDescription,  PPS(RES_APP_FILEDESC) \0
+VALUE FileVersion,  PPS(VER_LEVEL) \0
+VALUE ProductVersion,   PPS(VER_LEVEL) \0
+VALUE ProductName,  LibreOffice\0
+VALUE OriginalFilename, PPS(RES_APP_NAME) .exe\0
+VALUE InternalName, PPS(RES_APP_NAME) \0
+VALUE LegalCopyright,   S_CRIGHT  LibreOffice contributors 
and/or their affiliates. All rights reserved.\0
}
}
 
diff --git a/desktop/WinResTarget_sbase.mk b/desktop/WinResTarget_sbase.mk
index 008e436..f4f49d4 100644
--- a/desktop/WinResTarget_sbase.mk
+++ b/desktop/WinResTarget_sbase.mk
@@ -34,6 +34,7 @@
 
 $(eval $(call gb_WinResTarget_add_defs,sbase/src,\
 -DRES_APP_NAME=sbase \
+-DRES_APP_FILEDESC=$(PRODUCTNAME) Base \
 -DRES_APP_ICON=icons/base_app.ico \
 -DVERVARIANT=$(BUILD) \
 -DRES_APP_VENDOR=$(OOO_VENDOR) \
diff --git a/desktop/WinResTarget_scalc.mk b/desktop/WinResTarget_scalc.mk
index 89a2d2d..8781d0d 100644
--- a/desktop/WinResTarget_scalc.mk
+++ b/desktop/WinResTarget_scalc.mk
@@ -34,6 +34,7 @@
 
 $(eval $(call gb_WinResTarget_add_defs,scalc/src,\
 -DRES_APP_NAME=scalc \
+-DRES_APP_FILEDESC=$(PRODUCTNAME) Calc \
 -DRES_APP_ICON=icons/calc_app.ico \
 -DVERVARIANT=$(BUILD) \
 -DRES_APP_VENDOR=$(OOO_VENDOR) \
diff --git a/desktop/WinResTarget_sdraw.mk b/desktop/WinResTarget_sdraw.mk
index 44ef306..09a8bf2 100644
--- a/desktop/WinResTarget_sdraw.mk
+++ b/desktop/WinResTarget_sdraw.mk
@@ -34,6 +34,7 @@
 
 $(eval $(call gb_WinResTarget_add_defs,sdraw/src,\
 -DRES_APP_NAME=sdraw \
+-DRES_APP_FILEDESC=$(PRODUCTNAME) Draw \
 -DRES_APP_ICON=icons/draw_app.ico \
 -DVERVARIANT=$(BUILD) \
 -DRES_APP_VENDOR=$(OOO_VENDOR) \
diff --git a/desktop/WinResTarget_simpress.mk b/desktop/WinResTarget_simpress.mk
index 224af5b..eeb869f 100644
--- a/desktop/WinResTarget_simpress.mk
+++ b/desktop/WinResTarget_simpress.mk
@@ -34,6 +34,7 @@
 
 $(eval $(call gb_WinResTarget_add_defs,simpress/src,\
 -DRES_APP_NAME=simpress \
+-DRES_APP_FILEDESC=$(PRODUCTNAME) Impress \

[Libreoffice-commits] core.git: libxmlsec/ExternalProject_xmlsec.mk RepositoryExternal.mk

 RepositoryExternal.mk   |   12 
 libxmlsec/ExternalProject_xmlsec.mk |4 
 2 files changed, 16 insertions(+)

New commits:
commit b440cfcc548f3e9c74001c1e692b35ff272c409a
Author: Michael Meeks michael.me...@suse.com
Date:   Thu Feb 28 12:05:07 2013 +

add missing openssl  nss3 dependencies to libxmlsec

These are required at configure time.

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 0298234..af96980 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2283,6 +2283,8 @@ endef
 endif # GUIBASE=unx
 
 
+gb_ExternalProject__use_nss3:=
+
 ifeq (,$(filter DESKTOP,$(BUILD_TYPE)))
 
 gb_LinkTarget__use_nss3:=
@@ -2359,6 +2361,16 @@ $(call gb_LinkTarget_use_libraries,$(1),\
 
 endef
 
+define gb_ExternalProject__use_nss3
+$(call gb_ExternalProject_use_package,$(1),nss)
+$(call gb_ExternalProject_use_libraries,$(1),\
+   nspr4 \
+   nss3 \
+   smime3 \
+)
+
+endef
+
 endif
 endif # DESKTOP
 
diff --git a/libxmlsec/ExternalProject_xmlsec.mk 
b/libxmlsec/ExternalProject_xmlsec.mk
index 14ce4ae..70b5083 100644
--- a/libxmlsec/ExternalProject_xmlsec.mk
+++ b/libxmlsec/ExternalProject_xmlsec.mk
@@ -13,6 +13,10 @@ $(eval $(call gb_ExternalProject_use_unpacked,xmlsec,xmlsec))
 
 $(eval $(call gb_ExternalProject_use_external,xmlsec,libxml2))
 
+$(eval $(call gb_ExternalProject_use_external,xmlsec,nss3))
+
+$(eval $(call gb_ExternalProject_use_external,xmlsec,openssl))
+
 $(eval $(call gb_ExternalProject_register_targets,xmlsec,\
build \
 ))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/source

2013-02-28 Thread Herbert Dürr

 sw/source/filter/ww8/ww8par.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 4ffa2ddf2490005347a6567fcd2f619f06c33025
Author: Herbert DÃ¼rr h...@apache.org
Date:   Thu Jun 14 05:36:24 2012 +

#c708928# avoid double free error

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

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 8760c72..d18106e 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -793,6 +793,8 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream rSt,
 if (SeekToContent(DFF_Prop_pWrapPolygonVertices, rSt))
 {
 delete pImpRec-pWrapPolygon;
+pImpRec-pWrapPolygon = NULL;
+
 sal_uInt16 nNumElemVert, nNumElemMemVert, nElemSizeVert;
 rSt  nNumElemVert  nNumElemMemVert  nElemSizeVert;
 if (nNumElemVert  ((nElemSizeVert == 8) || (nElemSizeVert == 4)))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

odk / ridljar dep issue ...

I guess we're missing an effective dep in something for the ODK build
on the ridljar binary (or somesuch) ? this is from:

commit b440cfcc548f3e9c74001c1e692b35ff272c409a
Author: Michael Meeks michael.me...@suse.com
Date:   Thu Feb 28 12:05:07 2013 +

add missing openssl  nss3 dependencies to libxmlsec

HTH,

Michael.

[build HPP] oovbaapi
[build JAR] ridl
[build CHK] cppu
[build MOD] cppu
[build JDC] CustomTarget/odk/odkcommon/docs/java/ref/index.html
error: error reading 
/ssd/opt/libreoffice/master/solver/unxlngi6.pro/bin/ridl.jar; error in opening 
zip file
[build JCS] Jar/jurt
[build MOD] ridljar
make[1]: *** 
[/ssd/opt/libreoffice/master/workdir/unxlngi6.pro/CustomTarget/odk/odkcommon/docs/java/ref/index.html]
 Error 1
make[1]: *** Waiting for unfinished jobs
Note: Some input files use or override a deprecated API.
Note: Recompile with -Xlint:deprecation for details.
make: *** [build] Error 2
michael@linux-9ia1:/opt/libreoffice/master ls -l 
/ssd/opt/libreoffice/master/solver/unxlngi6.pro/bin/ridl.jar
-rw-r--r-- 1 michael users 251036 Feb 28 13:02 
/ssd/opt/libreoffice/master/solver/unxlngi6.pro/bin/ridl.jar

-- 
michael.me...@suse.com  , Pseudo Engineer, itinerant idiot

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

[Libreoffice-commits] core.git: 4 commits - sw/inc sw/source writerfilter/source

 sw/inc/IDocumentMarkAccess.hxx   |8 +++
 sw/source/core/crsr/bookmrk.cxx  |7 +++
 sw/source/core/doc/docbm.cxx |   51 ---
 sw/source/core/inc/MarkManager.hxx   |3 -
 sw/source/core/inc/bookmrk.hxx   |5 +-
 sw/source/core/unocore/unoobj.cxx|5 ++
 writerfilter/source/dmapper/DomainMapper.cxx |7 ++-
 writerfilter/source/dmapper/NumberingManager.cxx |8 +++
 8 files changed, 75 insertions(+), 19 deletions(-)

New commits:
commit 75b2f6b241046d4467a7c0c9cbf49b4533b46045
Author: Michael Stahl mst...@redhat.com
Date:   Thu Feb 28 13:27:57 2013 +0100

sw: remove CH_TXT_ATR_FORMELEMENT when CheckboxFieldmark is deleted

Change-Id: I5f58b558b15f7d11b75554195e10a258d027bcfc

diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index 0cb1562..c9e572e 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -357,6 +357,13 @@ namespace sw { namespace mark
 // want this for checkboxes
 this-GetMarkEnd( ).nContent--;
 }
+
+void CheckboxFieldmark::ReleaseDoc(SwDoc* const pDoc)
+{
+lcl_RemoveFieldMarks(this, pDoc,
+CH_TXT_ATR_FIELDSTART, CH_TXT_ATR_FORMELEMENT);
+}
+
 void CheckboxFieldmark::SetChecked(bool checked)
 {
 if ( IsChecked() != checked )
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 4d06724..93c212d 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -670,18 +670,17 @@ namespace sw { namespace mark
 #endif
 }
 
-struct LazyTextFieldmarkDeleter : public IDocumentMarkAccess::ILazyDeleter
+struct LazyFieldmarkDeleter : public IDocumentMarkAccess::ILazyDeleter
 {
-::boost::shared_ptrIMark const m_pTextFieldmark;
+::boost::shared_ptrIMark const m_pFieldmark;
 SwDoc *const m_pDoc;
-LazyTextFieldmarkDeleter(
+LazyFieldmarkDeleter(
 ::boost::shared_ptrIMark const pMark, SwDoc *const pDoc)
-: m_pTextFieldmark(pMark), m_pDoc(pDoc)
+: m_pFieldmark(pMark), m_pDoc(pDoc)
 { }
-virtual ~LazyTextFieldmarkDeleter()
+virtual ~LazyFieldmarkDeleter()
 {
-dynamic_castTextFieldmark*(m_pTextFieldmark.get())
--ReleaseDoc(m_pDoc);
+dynamic_castFieldmark *(m_pFieldmark.get())-ReleaseDoc(m_pDoc);
 }
 };
 
@@ -713,12 +712,7 @@ namespace sw { namespace mark
 MarkManager::deleteMark(..)
  - Bookmark not found.);
 m_vFieldmarks.erase(ppFieldmark);
-sw::mark::TextFieldmark* pTextFieldmark = 
dynamic_castsw::mark::TextFieldmark*(ppMark-get());
-if (pTextFieldmark)
-{
-ret.reset(
-new LazyTextFieldmarkDeleter(*ppMark, m_pDoc));
-}
+ret.reset(new LazyFieldmarkDeleter(*ppMark, m_pDoc));
 break;
 }
 case IDocumentMarkAccess::NAVIGATOR_REMINDER:
diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx
index bab92bb..54dc972 100644
--- a/sw/source/core/inc/bookmrk.hxx
+++ b/sw/source/core/inc/bookmrk.hxx
@@ -213,6 +213,8 @@ namespace sw {
 virtual void SetFieldHelptext(const ::rtl::OUString 
aFieldHelptext)
 { m_aFieldHelptext = aFieldHelptext; }
 
+virtual void ReleaseDoc(SwDoc* const) = 0;
+
 virtual void Invalidate();
 virtual rtl::OUString ToString() const;
 
@@ -228,7 +230,7 @@ namespace sw {
 public:
 TextFieldmark(const SwPaM rPaM);
 virtual void InitDoc(SwDoc* const io_pDoc);
-void ReleaseDoc(SwDoc* const pDoc);
+virtual void ReleaseDoc(SwDoc* const pDoc);
 };
 
 class CheckboxFieldmark
@@ -238,6 +240,7 @@ namespace sw {
 public:
 CheckboxFieldmark(const SwPaM rPaM);
 virtual void InitDoc(SwDoc* const io_pDoc);
+virtual void ReleaseDoc(SwDoc* const pDoc);
 bool IsChecked() const;
 void SetChecked(bool checked);
 
commit 5bf6797e81d54177508d3eb370e8242e3b58a3f8
Author: Michael Stahl mst...@redhat.com
Date:   Thu Feb 28 13:14:45 2013 +0100

fdo#61016: sw::marks::MarkManager: delay deletion of text fieldmarks

There is a STL assertion in deleteMarks because the ReleaseDoc call will
recursively call into deleteMark again and delete marks that are in the
vector vMarksToDelete up the stack.

Change-Id: I9139b174f8a518a551a3ca8520396202c306abcf

diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx
index 9b4bbb1..21e2d0c 100644
--- a/sw/inc/IDocumentMarkAccess.hxx
+++ b/sw/inc/IDocumentMarkAccess.hxx
@@ -57,6 +57,11 @@ class IDocumentMarkAccess

[PATCH libreoffice-3-6] fdo#61000: writerfilter: filter out unsupported list tab sto...

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2465

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/65/2465/1

fdo#61000: writerfilter: filter out unsupported list tab stops

Change-Id: Ic9d31eba84b1d8d9cf93d8289621a65d43521a8b
(cherry picked from commit dbb74ee9950dc706ea4fde3397a4c1d19b172fa9)
---
M writerfilter/source/dmapper/NumberingManager.cxx
1 file changed, 7 insertions(+), 1 deletion(-)



diff --git a/writerfilter/source/dmapper/NumberingManager.cxx 
b/writerfilter/source/dmapper/NumberingManager.cxx
index 7691410..86c38d5 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -127,7 +127,13 @@
 m_nXChFollow = nValue;
 break;
 case NS_ooxml::LN_CT_TabStop_pos:
-m_nTabstop = nValue;
+if (nValue  0)
+{
+SAL_INFO(writerfilter,
+unsupported list tab stop position   nValue);
+}
+else
+m_nTabstop = nValue;
 break;
 default:
 OSL_FAIL( this line should never be reached);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic9d31eba84b1d8d9cf93d8289621a65d43521a8b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Michael Stahl mst...@redhat.com

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

[PATCH libreoffice-4-0] fdo#61016: sw::marks::MarkManager: delay deletion of text fi...

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2466

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/66/2466/1

fdo#61016: sw::marks::MarkManager: delay deletion of text fieldmarks

There is a STL assertion in deleteMarks because the ReleaseDoc call will
recursively call into deleteMark again and delete marks that are in the
vector vMarksToDelete up the stack.

Change-Id: I9139b174f8a518a551a3ca8520396202c306abcf
(cherry picked from commit 5bf6797e81d54177508d3eb370e8242e3b58a3f8)
---
M sw/inc/IDocumentMarkAccess.hxx
M sw/source/core/doc/docbm.cxx
M sw/source/core/inc/MarkManager.hxx
3 files changed, 50 insertions(+), 14 deletions(-)



diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx
index 9b4bbb1..21e2d0c 100644
--- a/sw/inc/IDocumentMarkAccess.hxx
+++ b/sw/inc/IDocumentMarkAccess.hxx
@@ -57,6 +57,11 @@
 typedef container_t::const_iterator const_iterator_t;
 typedef container_t::const_reverse_iterator const_reverse_iterator_t;
 
+/// To avoid recursive calls of deleteMark, the removal of dummy
+/// characters of fieldmarks has to be delayed; this is the baseclass
+/// that can be subclassed for that purpose.
+struct ILazyDeleter { virtual ~ILazyDeleter() { } };
+
 /** Generates a new mark in the document for a certain selection.
 
@param rPaM
@@ -168,7 +173,8 @@
 @param ppMark
 [in] an iterator pointing to the Mark to be deleted.
 */
-virtual void deleteMark(const IDocumentMarkAccess::const_iterator_t 
ppMark) =0;
+virtual ::boost::shared_ptrILazyDeleter
+deleteMark(const IDocumentMarkAccess::const_iterator_t ppMark) =0;
 
 /** Deletes a mark.
 
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 76e9cfc..afd9fc2 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -644,16 +644,24 @@
 }
 }
 
-// we just remembered the iterators to delete, so we do not need to 
search
-// for the boost::shared_ptr (the entry in m_vMarks) again
-// reverse iteration, since erasing an entry invalidates iterators
-// behind it (the iterators in vMarksToDelete are sorted)
-for(vectorconst_iterator_t::reverse_iterator pppMark = 
vMarksToDelete.rbegin();
-pppMark != vMarksToDelete.rend();
-++pppMark)
 {
-deleteMark(*pppMark);
-}
+// fdo#61016 delay the deletion of the fieldmark characters
+// to prevent that from deleting the marks on that position
+// which would invalidate the iterators in vMarksToDelete
+vector ::boost::shared_ptrILazyDeleter  vDelay;
+vDelay.reserve(vMarksToDelete.size());
+// we just remembered the iterators to delete, so we do not need to
+// search for the boost::shared_ptr (the entry in m_vMarks) 
again.
+// reverse iteration, since erasing an entry invalidates iterators
+// behind it (the iterators in vMarksToDelete are sorted)
+for (vectorconst_iterator_t::reverse_iterator pppMark
+= vMarksToDelete.rbegin();
+pppMark != vMarksToDelete.rend();
+++pppMark)
+{
+vDelay.push_back(deleteMark(*pppMark));
+}
+} // scope to kill vDelay
 if(isSortingNeeded)
 sortMarks();
 #if 0
@@ -662,9 +670,26 @@
 #endif
 }
 
-void MarkManager::deleteMark(const const_iterator_t ppMark)
+struct LazyTextFieldmarkDeleter : public IDocumentMarkAccess::ILazyDeleter
 {
-if(ppMark == m_vMarks.end()) return;
+::boost::shared_ptrIMark const m_pTextFieldmark;
+SwDoc *const m_pDoc;
+LazyTextFieldmarkDeleter(
+::boost::shared_ptrIMark const pMark, SwDoc *const pDoc)
+: m_pTextFieldmark(pMark), m_pDoc(pDoc)
+{ }
+virtual ~LazyTextFieldmarkDeleter()
+{
+dynamic_castTextFieldmark*(m_pTextFieldmark.get())
+-ReleaseDoc(m_pDoc);
+}
+};
+
+::boost::shared_ptrIDocumentMarkAccess::ILazyDeleter
+MarkManager::deleteMark(const const_iterator_t ppMark)
+{
+::boost::shared_ptrILazyDeleter ret;
+if (ppMark == m_vMarks.end()) return ret;
 
 switch(IDocumentMarkAccess::GetType(**ppMark))
 {
@@ -690,7 +715,10 @@
 m_vFieldmarks.erase(ppFieldmark);
 sw::mark::TextFieldmark* pTextFieldmark = 
dynamic_castsw::mark::TextFieldmark*(ppMark-get());
 if (pTextFieldmark)
-pTextFieldmark-ReleaseDoc(m_pDoc);
+{
+ret.reset(
+new LazyTextFieldmarkDeleter(*ppMark, m_pDoc));
+}
 break;

[PATCH libreoffice-4-0] sw: remove CH_TXT_ATR_FORMELEMENT when CheckboxFieldmark is ...

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2467

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/67/2467/1

sw: remove CH_TXT_ATR_FORMELEMENT when CheckboxFieldmark is deleted

Change-Id: I5f58b558b15f7d11b75554195e10a258d027bcfc
(cherry picked from commit 75b2f6b241046d4467a7c0c9cbf49b4533b46045)
---
M sw/source/core/crsr/bookmrk.cxx
M sw/source/core/doc/docbm.cxx
M sw/source/core/inc/bookmrk.hxx
3 files changed, 18 insertions(+), 14 deletions(-)



diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index 7e84482..a3c5217 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -355,6 +355,13 @@
 // want this for checkboxes
 this-GetMarkEnd( ).nContent--;
 }
+
+void CheckboxFieldmark::ReleaseDoc(SwDoc* const pDoc)
+{
+lcl_RemoveFieldMarks(this, pDoc,
+CH_TXT_ATR_FIELDSTART, CH_TXT_ATR_FORMELEMENT);
+}
+
 void CheckboxFieldmark::SetChecked(bool checked)
 {
 if ( IsChecked() != checked )
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index afd9fc2..8f785dd 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -670,18 +670,17 @@
 #endif
 }
 
-struct LazyTextFieldmarkDeleter : public IDocumentMarkAccess::ILazyDeleter
+struct LazyFieldmarkDeleter : public IDocumentMarkAccess::ILazyDeleter
 {
-::boost::shared_ptrIMark const m_pTextFieldmark;
+::boost::shared_ptrIMark const m_pFieldmark;
 SwDoc *const m_pDoc;
-LazyTextFieldmarkDeleter(
+LazyFieldmarkDeleter(
 ::boost::shared_ptrIMark const pMark, SwDoc *const pDoc)
-: m_pTextFieldmark(pMark), m_pDoc(pDoc)
+: m_pFieldmark(pMark), m_pDoc(pDoc)
 { }
-virtual ~LazyTextFieldmarkDeleter()
+virtual ~LazyFieldmarkDeleter()
 {
-dynamic_castTextFieldmark*(m_pTextFieldmark.get())
--ReleaseDoc(m_pDoc);
+dynamic_castFieldmark *(m_pFieldmark.get())-ReleaseDoc(m_pDoc);
 }
 };
 
@@ -713,12 +712,7 @@
 MarkManager::deleteMark(..)
  - Bookmark not found.);
 m_vFieldmarks.erase(ppFieldmark);
-sw::mark::TextFieldmark* pTextFieldmark = 
dynamic_castsw::mark::TextFieldmark*(ppMark-get());
-if (pTextFieldmark)
-{
-ret.reset(
-new LazyTextFieldmarkDeleter(*ppMark, m_pDoc));
-}
+ret.reset(new LazyFieldmarkDeleter(*ppMark, m_pDoc));
 break;
 }
 case IDocumentMarkAccess::NAVIGATOR_REMINDER:
diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx
index 6937a19..d4959b2 100644
--- a/sw/source/core/inc/bookmrk.hxx
+++ b/sw/source/core/inc/bookmrk.hxx
@@ -213,6 +213,8 @@
 virtual void SetFieldHelptext(const ::rtl::OUString 
aFieldHelptext)
 { m_aFieldHelptext = aFieldHelptext; }
 
+virtual void ReleaseDoc(SwDoc* const) = 0;
+
 virtual void Invalidate();
 virtual rtl::OUString ToString() const;
 
@@ -228,7 +230,7 @@
 public:
 TextFieldmark(const SwPaM rPaM);
 virtual void InitDoc(SwDoc* const io_pDoc);
-void ReleaseDoc(SwDoc* const pDoc);
+virtual void ReleaseDoc(SwDoc* const pDoc);
 };
 
 class CheckboxFieldmark
@@ -238,6 +240,7 @@
 public:
 CheckboxFieldmark(const SwPaM rPaM);
 virtual void InitDoc(SwDoc* const io_pDoc);
+virtual void ReleaseDoc(SwDoc* const pDoc);
 bool IsChecked() const;
 void SetChecked(bool checked);
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5f58b558b15f7d11b75554195e10a258d027bcfc
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Michael Stahl mst...@redhat.com

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

[Libreoffice-commits] core.git: solenv/bin

 solenv/bin/modules/installer.pm|   15 -
 solenv/bin/modules/installer/scppatchsoname.pm |  204 -
 2 files changed, 1 insertion(+), 218 deletions(-)

New commits:
commit 6aabf38ed7dc7fbf2be26fdf909fb47dcdb7e44d
Author: Andras Timar ati...@suse.com
Date:   Thu Feb 28 14:25:31 2013 +0100

remove code that handled the recently obsoleted PATCH_SO_NAME flag

Change-Id: I34b99883711b41b8038d1229f00bc670582d6398

diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index 94e3791..fdf9370 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -50,7 +50,6 @@ use installer::packagelist;
 use installer::parameter;
 use installer::pathanalyzer;
 use installer::profiles;
-use installer::scppatchsoname;
 use installer::scpzipfiles;
 use installer::scriptitems;
 use installer::setupscript;
@@ -634,16 +633,6 @@ sub run {
 
installer::scpzipfiles::resolving_scpzip_replace_flag($filesinproductlanguageresolvedarrayref,
 $allvariableshashref, File, $languagestringref);
 
 #
-# Files with flag PATCH_SO_NAME
-#
-
-installer::logger::print_message( ... analyzing files with flag 
PATCH_SO_NAME ...\n );
-
-# Editing files with flag PATCH_SO_NAME.
-
-
installer::scppatchsoname::resolving_patchsoname_flag($filesinproductlanguageresolvedarrayref,
 $allvariableshashref, File, $languagestringref);
-
-#
 # Files with flag HIDDEN
 #
 
@@ -678,12 +667,10 @@ sub run {
 
 
installer::scriptitems::get_Source_Directory_For_Files_From_Includepathlist($scpactionsinproductlanguageresolvedarrayref,
 $includepatharrayref_lang, $dirsinproductlanguageresolvedarrayref, 
ScpActions);
 
-# Editing scpactions with flag SCPZIP_REPLACE and PATCH_SO_NAME.
+# Editing scpactions with flag SCPZIP_REPLACE.
 
 
installer::scpzipfiles::resolving_scpzip_replace_flag($scpactionsinproductlanguageresolvedarrayref,
 $allvariableshashref, ScpAction, $languagestringref);
 
-
installer::scppatchsoname::resolving_patchsoname_flag($scpactionsinproductlanguageresolvedarrayref,
 $allvariableshashref, ScpAction, $languagestringref);
-
 #
 # language dependent links part
 #
diff --git a/solenv/bin/modules/installer/scppatchsoname.pm 
b/solenv/bin/modules/installer/scppatchsoname.pm
deleted file mode 100644
index 80aea6f..000
--- a/solenv/bin/modules/installer/scppatchsoname.pm
+++ /dev/null
@@ -1,204 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the License); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-package installer::scppatchsoname;
-
-use installer::files;
-use installer::globals;
-use installer::logger;
-use installer::setupscript;
-use installer::systemactions;
-
-
-# The length of the new string must be identical with the length of the old 
string
-
-
-sub change_length_of_string
-{
-my ($newstringref, $oldstring) = @_;
-
-while ( length($$newstringref)  length($oldstring) )
-{
-$$newstringref = $$newstringref . chr(0);
-}
-}
-
-
-# The length of the new string must be identical with the length of the old 
string
-
-
-sub change_length_of_string_with_letter
-{
-my ($newstringref, $oldstring, $onestring) = @_;
-
-while ( length($$newstringref)  length($oldstring) )
-{
-$$newstringref = $$newstringref . $onestring;
-}
-}
-
-
-# Converting a string to a unicode string
-
-
-sub convert_to_unicode

[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - writerfilter/source

 writerfilter/source/dmapper/NumberingManager.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit d9fb9481994a9251ce714bfaa266072c654f646c
Author: Michael Stahl mst...@redhat.com
Date:   Wed Feb 27 23:20:24 2013 +0100

fdo#61000: writerfilter: filter out unsupported list tab stops

Change-Id: Ic9d31eba84b1d8d9cf93d8289621a65d43521a8b
(cherry picked from commit dbb74ee9950dc706ea4fde3397a4c1d19b172fa9)
Reviewed-on: https://gerrit.libreoffice.org/2465
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/writerfilter/source/dmapper/NumberingManager.cxx 
b/writerfilter/source/dmapper/NumberingManager.cxx
index 7691410..86c38d5 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -127,7 +127,13 @@ void ListLevel::SetValue( Id nId, sal_Int32 nValue )
 m_nXChFollow = nValue;
 break;
 case NS_ooxml::LN_CT_TabStop_pos:
-m_nTabstop = nValue;
+if (nValue  0)
+{
+SAL_INFO(writerfilter,
+unsupported list tab stop position   nValue);
+}
+else
+m_nTabstop = nValue;
 break;
 default:
 OSL_FAIL( this line should never be reached);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: are the New Graphic Compress features accessable for API

2013-02-28 Thread Fernand Vanrie


Caolán ,

Thanks for your interest,

On Sun, 2013-02-24 at 13:49 +0100, Fernand Vanrie wrote:

Tomaž Vajngerl made new Graphic Compress tools, they are sinds 4.0
available using the GUI and the new Compress Graphics Dialog in Draw,
Calc and Impress.

1: Can this features been accessed using the API and Basic ?

2: Is the new Lanczos Interpolation also available when using The
Graphic Profider to export a Graphic ?

- also  for Tomaž  future plans ?

I sort of doubt its accessible via UNO (but maybe I'm wrong),
- at least we need a argument in the export filter settings to choose  
the the interpolation quality using Draw-export and also for  the 
Graphic Provider





unless
Tomaž has future plans around that ?

C.

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


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

[PUSHED libreoffice-3-6] fdo#61000: writerfilter: filter out unsupported list tab sto...

2013-02-28 Thread Miklos Vajna (via Code Review)

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/2465

Approvals:
  Miklos Vajna: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic9d31eba84b1d8d9cf93d8289621a65d43521a8b
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Michael Stahl mst...@redhat.com
Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz

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

[PATCH] fdo#39468: Translate German comments

2013-02-28 Thread David Verrier (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2468

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/68/2468/1

fdo#39468: Translate German comments

Change-Id: I29619fab12ae22bda6a8f325eece63d777b0470b
---
M dbaccess/source/ui/querydesign/TableWindow.cxx
1 file changed, 21 insertions(+), 21 deletions(-)



diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx 
b/dbaccess/source/ui/querydesign/TableWindow.cxx
index 8c85590..413b3ab 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -83,18 +83,18 @@
 {
 DBG_CTOR(OTableWindow,NULL);
 
-// Position und Groesse bestimmen
+// Set position and size
 if( GetData()-HasPosition() )
 SetPosPixel( GetData()-GetPosition() );
 
 if( GetData()-HasSize() )
 SetSizePixel( GetData()-GetSize() );
 
-// Hintergrund setzen
+// Set background
 const StyleSettings  aSystemStyle = 
Application::GetSettings().GetStyleSettings();
 SetBackground(Wallpaper(aSystemStyle.GetFaceColor()));
-// und Textfarbe (obwohl ich eigentlich keinen Text habe, aber wer weiss, 
was
-// abgeleitete Klassen machen)
+// Set the text colour even though there is no text,
+// because derived classes might need it
 SetTextColor(aSystemStyle.GetButtonTextColor());
 
 EnableClipSiblings();
@@ -282,17 +282,17 @@
 if ( !m_pListBox )
 {
 m_pListBox = CreateListBox();
-OSL_ENSURE( m_pListBox != NULL, OTableWindow::Init() : CreateListBox 
hat NULL geliefert ! );
+OSL_ENSURE( m_pListBox != NULL, OTableWindow::Init() : CreateListBox 
returned NULL ! );
 m_pListBox-SetSelectionMode( MULTIPLE_SELECTION );
 }
 
-// Titel setzen
+// Set the title
 m_aTitle.SetText( m_pData-GetWinName() );
 m_aTitle.Show();
 
 m_pListBox-Show();
 
-// die Felder in die ListBox eintragen
+// add the fields to the ListBox
 clearListBox();
 sal_Bool bSuccess = FillListBox();
 if ( bSuccess )
@@ -307,8 +307,8 @@
 {
 if (rDCEvt.GetType() == DATACHANGED_SETTINGS)
 {
-// nehmen wir den worst-case an : die Farben haben sich geaendert, also
-// mich anpassen
+// In the worst-case the colours have changed so
+// adapt myself to the new colours
 const StyleSettings  aSystemStyle = 
Application::GetSettings().GetStyleSettings();
 SetBackground(Wallpaper(Color(aSystemStyle.GetFaceColor(;
 SetTextColor(aSystemStyle.GetButtonTextColor());
@@ -325,21 +325,21 @@
 
//--
 void OTableWindow::Draw3DBorder(const Rectangle rRect)
 {
-// die Style-Settings des Systems fuer meine Farben
+// Use the System Style-Settings for my colours
 const StyleSettings aSystemStyle = 
Application::GetSettings().GetStyleSettings();
 
-// Schwarze Linie unten und rechts
+// Black lines for bottom and right
 SetLineColor(aSystemStyle.GetDarkShadowColor());
 DrawLine( rRect.BottomLeft(), rRect.BottomRight() );
 DrawLine( rRect.BottomRight(), rRect.TopRight() );
 
-// Dunkelgraue Linie ueber der schwarzen
+// Dark grey lines over the black lines
 SetLineColor(aSystemStyle.GetShadowColor());
 Point aEHvector(1,1);
 DrawLine( rRect.BottomLeft()+Point(1,-1), rRect.BottomRight() - aEHvector 
);
 DrawLine( rRect.BottomRight() - aEHvector, rRect.TopRight()+Point(-1,1) );
 
-// Hellgraue Linie links und oben
+// Light grey lines for top and left
 SetLineColor(aSystemStyle.GetLightColor());
 DrawLine( rRect.BottomLeft()+Point(1,-2), rRect.TopLeft() + aEHvector );
 DrawLine( rRect.TopLeft() + aEHvector, rRect.TopRight()+Point(-2,1) );
@@ -389,7 +389,7 @@
 {
 SizeaOutSize = GetOutputSizePixel();
 //
-// Flags anpassen, wenn Mauszeiger in sizingArea
+// Set the flags when the mouse cursor is in the sizing area
 m_nSizingFlags = SIZING_NONE;
 
 if( _rPos.X()  TABWIN_SIZING_AREA )
@@ -419,7 +419,7 @@
 
 
 //
-// Mauszeiger anpassen, wenn Mauszeiger in sizingArea
+// Set the mouse cursor when it is in the sizing area
 switch( m_nSizingFlags )
 {
 case SIZING_TOP:
@@ -450,8 +450,8 @@
 void OTableWindow::MouseButtonDown( const MouseEvent rEvt )
 {
 //
-// Wenn sizing, dann bekommt Parent die Nachricht,
-// dass jetzt die Fenstergroesse seines Childs veraendert wird
+// When resizing, the parent must be informed that
+// the window size of its child has changed
 if( m_nSizingFlags )
 getTableView()-BeginChildSizing( this, GetPointer() );
 
@@ -464,14 +464,14 @@
 void OTableWindow::Resize()
 {

[Libreoffice-commits] libcdr.git: src/lib

2013-02-28 Thread Fridrich Štrba

 src/lib/CDRCollector.h  |2 
 src/lib/CDRContentCollector.cpp |   39 +-
 src/lib/CDRContentCollector.h   |2 
 src/lib/CDRParser.cpp   |  153 
 src/lib/CDRStylesCollector.cpp  |3 
 5 files changed, 104 insertions(+), 95 deletions(-)

New commits:
commit dd762061856bf745891a9952bd06106ec22d2b67
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Feb 28 15:14:40 2013 +0100

Handle multiple paragraphs of text

diff --git a/src/lib/CDRCollector.h b/src/lib/CDRCollector.h
index 4b6..e2cac1f 100644
--- a/src/lib/CDRCollector.h
+++ b/src/lib/CDRCollector.h
@@ -62,7 +62,7 @@ public:
   std::vectorCDRPage m_pages;
   std::mapunsigned, CDRColor m_documentPalette;
   std::mapunsigned, CDRFont m_fonts;
-  std::mapunsigned, CDRText m_texts;
+  std::mapunsigned, std::vectorCDRText  m_texts;
 
   unsigned _getRGBColor(const CDRColor color);
   unsigned getBMPColor(const CDRColor color);
diff --git a/src/lib/CDRContentCollector.cpp b/src/lib/CDRContentCollector.cpp
index e407fff..3e9669f 100644
--- a/src/lib/CDRContentCollector.cpp
+++ b/src/lib/CDRContentCollector.cpp
@@ -52,7 +52,7 @@ 
libcdr::CDRContentCollector::CDRContentCollector(libcdr::CDRParserState ps, lib
   m_isPageProperties(false), m_isPageStarted(false), m_ignorePage(false),
   m_page(ps.m_pages[0]), m_pageIndex(0), m_currentFildId(0), 
m_currentOutlId(0), m_spnd(0),
   m_currentObjectLevel(0), m_currentGroupLevel(0), m_currentVectLevel(0), 
m_currentPageLevel(0),
-  m_currentImage(), m_currentText(), m_currentTextOffsetX(0.0), 
m_currentTextOffsetY(0.0),
+  m_currentImage(), m_currentText(0), m_currentTextOffsetX(0.0), 
m_currentTextOffsetY(0.0),
   m_currentBBox(), m_currentPath(), m_currentTransforms(), m_fillTransforms(),
   m_polygon(0), m_isInPolygon(false), m_isInSpline(false), m_outputElements(0),
   m_contentOutputElements(), m_fillOutputElements(),
@@ -391,7 +391,7 @@ void libcdr::CDRContentCollector::_flushCurrentPath()
 
 outputElement.addGraphicObject(propList, m_currentImage.getImage());
   }
-  if (m_currentText.m_text.len())
+  if (m_currentText  !m_currentText-empty())
   {
 double currentTextOffsetX = 0.0;
 double currentTextOffsetY = 0.0;
@@ -417,17 +417,20 @@ void libcdr::CDRContentCollector::_flushCurrentPath()
 textFrameProps.insert(fo:padding-left, 0.0);
 textFrameProps.insert(fo:padding-right, 0.0);
 outputElement.addStartTextObject(textFrameProps, WPXPropertyListVector());
-outputElement.addStartTextLine(WPXPropertyList());
-WPXPropertyList spanProps;
-double fontSize = 
(double)cdr_round(144.0*m_currentText.m_charStyle.m_fontSize) / 2.0;
-spanProps.insert(fo:font-size, fontSize, WPX_POINT);
-std::mapunsigned, CDRFont::const_iterator iterFont = 
m_ps.m_fonts.find(m_currentText.m_charStyle.m_fontId);
-if (iterFont != m_ps.m_fonts.end())
-  spanProps.insert(style:font-name, iterFont-second.m_name);
-outputElement.addStartTextSpan(spanProps);
-outputElement.addInsertText(m_currentText.m_text);
-outputElement.addEndTextSpan();
-outputElement.addEndTextLine();
+for (unsigned i = 0; i  m_currentText-size(); ++i)
+{
+  outputElement.addStartTextLine(WPXPropertyList());
+  WPXPropertyList spanProps;
+  double fontSize = 
(double)cdr_round(144.0*(*m_currentText)[i].m_charStyle.m_fontSize) / 2.0;
+  spanProps.insert(fo:font-size, fontSize, WPX_POINT);
+  std::mapunsigned, CDRFont::const_iterator iterFont = 
m_ps.m_fonts.find((*m_currentText)[i].m_charStyle.m_fontId);
+  if (iterFont != m_ps.m_fonts.end())
+spanProps.insert(style:font-name, iterFont-second.m_name);
+  outputElement.addStartTextSpan(spanProps);
+  outputElement.addInsertText((*m_currentText)[i].m_text);
+  outputElement.addEndTextSpan();
+  outputElement.addEndTextLine();
+}
 outputElement.addEndTextObject();
   }
   m_currentImage = libcdr::CDRImage();
@@ -436,7 +439,7 @@ void libcdr::CDRContentCollector::_flushCurrentPath()
   m_currentTransforms.clear();
   m_fillTransforms = libcdr::CDRTransforms();
   m_fillOpacity = 1.0;
-  m_currentText = CDRText();
+  m_currentText = 0;
 }
 
 void libcdr::CDRContentCollector::collectTransform(const CDRTransforms 
transforms, bool considerGroupTransform)
@@ -1136,16 +1139,16 @@ void 
libcdr::CDRContentCollector::collectVectorPattern(unsigned id, const WPXBin
 
 void libcdr::CDRContentCollector::collectArtisticText()
 {
-  std::mapunsigned, CDRText::const_iterator iter = m_ps.m_texts.find(m_spnd);
+  std::mapunsigned, std::vectorCDRText ::const_iterator iter = 
m_ps.m_texts.find(m_spnd);
   if (iter != m_ps.m_texts.end())
-m_currentText = iter-second;
+m_currentText = (iter-second);
 }
 
 void libcdr::CDRContentCollector::collectParagraphText()
 {
-  std::mapunsigned, CDRText::const_iterator iter = m_ps.m_texts.find(m_spnd);
+  std::mapunsigned, std::vectorCDRText ::const_iterator iter =

[Libreoffice-commits] core.git: dbaccess/source

2013-02-28 Thread David Verrier

 dbaccess/source/ui/querydesign/TableWindow.cxx |   42 -
 1 file changed, 21 insertions(+), 21 deletions(-)

New commits:
commit 4626cda96af778ee34599f572567cfbc89d06983
Author: David Verrier dverr...@gmail.com
Date:   Thu Feb 28 14:55:08 2013 +0100

fdo#39468: Translate German comments

Change-Id: I29619fab12ae22bda6a8f325eece63d777b0470b
Reviewed-on: https://gerrit.libreoffice.org/2468
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com

diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx 
b/dbaccess/source/ui/querydesign/TableWindow.cxx
index 8c85590..413b3ab 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -83,18 +83,18 @@ OTableWindow::OTableWindow( Window* pParent, const 
TTableWindowData::value_type
 {
 DBG_CTOR(OTableWindow,NULL);
 
-// Position und Groesse bestimmen
+// Set position and size
 if( GetData()-HasPosition() )
 SetPosPixel( GetData()-GetPosition() );
 
 if( GetData()-HasSize() )
 SetSizePixel( GetData()-GetSize() );
 
-// Hintergrund setzen
+// Set background
 const StyleSettings  aSystemStyle = 
Application::GetSettings().GetStyleSettings();
 SetBackground(Wallpaper(aSystemStyle.GetFaceColor()));
-// und Textfarbe (obwohl ich eigentlich keinen Text habe, aber wer weiss, 
was
-// abgeleitete Klassen machen)
+// Set the text colour even though there is no text,
+// because derived classes might need it
 SetTextColor(aSystemStyle.GetButtonTextColor());
 
 EnableClipSiblings();
@@ -282,17 +282,17 @@ sal_Bool OTableWindow::Init()
 if ( !m_pListBox )
 {
 m_pListBox = CreateListBox();
-OSL_ENSURE( m_pListBox != NULL, OTableWindow::Init() : CreateListBox 
hat NULL geliefert ! );
+OSL_ENSURE( m_pListBox != NULL, OTableWindow::Init() : CreateListBox 
returned NULL ! );
 m_pListBox-SetSelectionMode( MULTIPLE_SELECTION );
 }
 
-// Titel setzen
+// Set the title
 m_aTitle.SetText( m_pData-GetWinName() );
 m_aTitle.Show();
 
 m_pListBox-Show();
 
-// die Felder in die ListBox eintragen
+// add the fields to the ListBox
 clearListBox();
 sal_Bool bSuccess = FillListBox();
 if ( bSuccess )
@@ -307,8 +307,8 @@ void OTableWindow::DataChanged(const DataChangedEvent 
rDCEvt)
 {
 if (rDCEvt.GetType() == DATACHANGED_SETTINGS)
 {
-// nehmen wir den worst-case an : die Farben haben sich geaendert, also
-// mich anpassen
+// In the worst-case the colours have changed so
+// adapt myself to the new colours
 const StyleSettings  aSystemStyle = 
Application::GetSettings().GetStyleSettings();
 SetBackground(Wallpaper(Color(aSystemStyle.GetFaceColor(;
 SetTextColor(aSystemStyle.GetButtonTextColor());
@@ -325,21 +325,21 @@ void OTableWindow::Paint( const Rectangle rRect )
 
//--
 void OTableWindow::Draw3DBorder(const Rectangle rRect)
 {
-// die Style-Settings des Systems fuer meine Farben
+// Use the System Style-Settings for my colours
 const StyleSettings aSystemStyle = 
Application::GetSettings().GetStyleSettings();
 
-// Schwarze Linie unten und rechts
+// Black lines for bottom and right
 SetLineColor(aSystemStyle.GetDarkShadowColor());
 DrawLine( rRect.BottomLeft(), rRect.BottomRight() );
 DrawLine( rRect.BottomRight(), rRect.TopRight() );
 
-// Dunkelgraue Linie ueber der schwarzen
+// Dark grey lines over the black lines
 SetLineColor(aSystemStyle.GetShadowColor());
 Point aEHvector(1,1);
 DrawLine( rRect.BottomLeft()+Point(1,-1), rRect.BottomRight() - aEHvector 
);
 DrawLine( rRect.BottomRight() - aEHvector, rRect.TopRight()+Point(-1,1) );
 
-// Hellgraue Linie links und oben
+// Light grey lines for top and left
 SetLineColor(aSystemStyle.GetLightColor());
 DrawLine( rRect.BottomLeft()+Point(1,-2), rRect.TopLeft() + aEHvector );
 DrawLine( rRect.TopLeft() + aEHvector, rRect.TopRight()+Point(-2,1) );
@@ -389,7 +389,7 @@ void OTableWindow::setSizingFlag(const Point _rPos)
 {
 SizeaOutSize = GetOutputSizePixel();
 //
-// Flags anpassen, wenn Mauszeiger in sizingArea
+// Set the flags when the mouse cursor is in the sizing area
 m_nSizingFlags = SIZING_NONE;
 
 if( _rPos.X()  TABWIN_SIZING_AREA )
@@ -419,7 +419,7 @@ void OTableWindow::MouseMove( const MouseEvent rEvt )
 
 
 //
-// Mauszeiger anpassen, wenn Mauszeiger in sizingArea
+// Set the mouse cursor when it is in the sizing area
 switch( m_nSizingFlags )
 {
 case SIZING_TOP:
@@ -450,8 +450,8 @@ void OTableWindow::MouseMove( const

[PUSHED] fdo#39468: Translate German comments

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/2468

Approvals:
  Michael Meeks: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I29619fab12ae22bda6a8f325eece63d777b0470b
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Verrier dverr...@gmail.com
Gerrit-Reviewer: Michael Meeks michael.me...@suse.com

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

[Libreoffice-commits] core.git: editeng/source sc/source sw/inc sw/source vcl/inc vcl/Package_inc.mk vcl/source

2013-02-28 Thread Tor Lillqvist

 editeng/source/editeng/impedit2.cxx |  106 
 sc/source/ui/app/inputwin.cxx   |2 
 sc/source/ui/view/gridwin.cxx   |   28 -
 sw/inc/pch/precompiled_sw.hxx   |1 
 sw/source/ui/docvw/edtwin.cxx   |   90 --
 vcl/Package_inc.mk  |1 
 vcl/inc/vcl/cmdevt.h|   50 
 vcl/inc/vcl/cmdevt.hxx  |   53 --
 vcl/source/control/edit.cxx |   37 
 9 files changed, 2 insertions(+), 366 deletions(-)

New commits:
commit 04df3cb2b9e1026b8aeb809805bc4878c047eb76
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Feb 28 00:11:15 2013 +0200

Remove dead voice command code

I don't see voice input commands being generated anywhere. Nobody seems to
know what this code has been used for.

Change-Id: I4e4221dd4dff76086d0268be286c3605e669bae7
Reviewed-on: https://gerrit.libreoffice.org/2452
Reviewed-by: Niko RÃ¶nkkÃ¶ ron...@iki.fi
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/editeng/source/editeng/impedit2.cxx 
b/editeng/source/editeng/impedit2.cxx
index 8129570..d34a387 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -49,7 +49,6 @@
 #include editeng/frmdiritem.hxx
 #include editeng/fontitem.hxx
 #include editeng/justifyitem.hxx
-#include vcl/cmdevt.h
 
 #include com/sun/star/i18n/CharacterIteratorMode.hpp
 #include com/sun/star/i18n/WordType.hpp
@@ -348,110 +347,7 @@ void ImpEditEngine::Command( const CommandEvent rCEvt, 
EditView* pView )
 {
 GetSelEngine().SetCurView( pView );
 SetActiveView( pView );
-if ( rCEvt.GetCommand() == COMMAND_VOICE )
-{
-const CommandVoiceData* pData = rCEvt.GetVoiceData();
-if ( pData-GetType() == VOICECOMMANDTYPE_DICTATION )
-{
-// Turn functions into KeyEvent if no corresponding method to
-// EditView/EditEngine so that Undo remains consistent.
-SfxPoolItem* pNewAttr = NULL;
-
-switch ( pData-GetCommand() )
-{
-case DICTATIONCOMMAND_UNKNOWN:
-{
-pView-InsertText( pData-GetText() );
-}
-break;
-case DICTATIONCOMMAND_NEWPARAGRAPH:
-{
-pView-PostKeyEvent( KeyEvent( 0, KeyCode( KEY_RETURN, 0 ) 
) );
-}
-break;
-case DICTATIONCOMMAND_NEWLINE:
-{
-pView-PostKeyEvent( KeyEvent( 0, KeyCode( KEY_RETURN, 
KEY_SHIFT ) ) );
-}
-break;
-case DICTATIONCOMMAND_TAB:
-{
-pView-PostKeyEvent( KeyEvent( 0, KeyCode( KEY_TAB, 0 ) ) 
);
-}
-break;
-case DICTATIONCOMMAND_LEFT:
-{
-pView-PostKeyEvent( KeyEvent( 0, KeyCode( KEY_LEFT, 
KEY_MOD1  ) ) );
-}
-break;
-case DICTATIONCOMMAND_RIGHT:
-{
-pView-PostKeyEvent( KeyEvent( 0, KeyCode( KEY_RIGHT, 
KEY_MOD1  ) ) );
-}
-break;
-case DICTATIONCOMMAND_UP:
-{
-pView-PostKeyEvent( KeyEvent( 0, KeyCode( KEY_UP, 0 ) ) );
-}
-break;
-case DICTATIONCOMMAND_DOWN:
-{
-pView-PostKeyEvent( KeyEvent( 0, KeyCode( KEY_UP, 0 ) ) );
-}
-break;
-case DICTATIONCOMMAND_UNDO:
-{
-pView-Undo();
-}
-break;
-case DICTATIONCOMMAND_DEL:
-{
-pView-PostKeyEvent( KeyEvent( 0, KeyCode( KEY_LEFT, 
KEY_MOD1|KEY_SHIFT  ) ) );
-pView-DeleteSelected();
-}
-break;
-case DICTATIONCOMMAND_BOLD_ON:
-{
-pNewAttr = new SvxWeightItem( WEIGHT_BOLD, EE_CHAR_WEIGHT 
);
-}
-break;
-case DICTATIONCOMMAND_BOLD_OFF:
-{
-pNewAttr = new SvxWeightItem( WEIGHT_NORMAL, 
EE_CHAR_WEIGHT );
-}
-break;
-case DICTATIONCOMMAND_ITALIC_ON:
-{
-pNewAttr = new SvxPostureItem( ITALIC_NORMAL, 
EE_CHAR_ITALIC );
-}
-break;
-case DICTATIONCOMMAND_ITALIC_OFF:
-{
-pNewAttr = new SvxPostureItem( ITALIC_NORMAL, 
EE_CHAR_ITALIC );
-}
-break;
-case DICTATIONCOMMAND_UNDERLINE_ON:
-{
-pNewAttr =

[PUSHED] Remove dead voice command code

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/2452

Approvals:
  Caolán McNamara: Verified; Looks good to me, approved
  Niko Rönkkö: Looks good to me, but someone else must approve


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4e4221dd4dff76086d0268be286c3605e669bae7
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Tor Lillqvist t...@iki.fi
Gerrit-Reviewer: Caolán McNamara caol...@redhat.com
Gerrit-Reviewer: Niko Rönkkö ron...@iki.fi

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

Re: [RESOLVED] fdo#36668 - Add image captions above the image

On Thu, 2013-01-03 at 12:35 +0100, Bartosz wrote:
 Hi.
 I would like to start work on fdo#36668 Possibility to add image captions 
 above the image.
 
 Writer allows captions of tables above or below the table.
 If someone want to add a caption to an image, the option position is always 
 Below.
 More info (with screenshots) is available at:
 https://bugs.freedesktop.org/show_bug.cgi?id=36668
 
 Do you know where image insertion (especially position) is implemented?
 Where should I start looking for?

Because I fairly recently converted that caption dialog to the new
widget layout I was in that code area recently. Anyway...
a) to find the code for something visible in the UI search for the
string in http://opengrok.libreoffice.org/ That'll find you the .src
or .ui where the string is and then it's a matter of grepping for the
name of the surrounding .ui or dialog/tabpage of the .src in the source
to find where it's implemented. In this case it's
sw/source/ui/frmdlg/cption.cxx
b) Turns out to be trivial to fix this, the fundamental bug appears that
the original code put the orientation as the first argument to the
orientation class and not the *second*. Fixed as
http://cgit.freedesktop.org/libreoffice/core/commit/?id=2a9c14730d93ea434cb456d248c37c7ff41fa6c0

C.

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

[Libreoffice-commits] core.git: sfx2/source

 sfx2/source/dialog/mgetempl.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f2e706d87399911e300c0101c876e44f2819c505
Author: Andras Timar ati...@suse.com
Date:   Thu Feb 28 16:00:00 2013 +0100

fdo#61453 fix truncation on German UI

Change-Id: I4ec173dc2856a6208f1149a5a9cbfc18873d1f2e

diff --git a/sfx2/source/dialog/mgetempl.src b/sfx2/source/dialog/mgetempl.src
index 218883d..ac03fb0 100644
--- a/sfx2/source/dialog/mgetempl.src
+++ b/sfx2/source/dialog/mgetempl.src
@@ -43,7 +43,7 @@ TabPage TP_MANAGE_STYLES
 MultiLineEdit MLE_NAME
 {
 Pos = MAP_APPFONT ( 70 , 8  ) ;
-Size = MAP_APPFONT ( 80 , 12 ) ;
+Size = MAP_APPFONT ( 184 , 12 ) ;
 Border = FALSE;
 ReadOnly = TRUE;
 Hide = TRUE;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH libreoffice-4-0] fdo#61453 fix truncation on German UI

2013-02-28 Thread Andras Timar (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2469

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/69/2469/1

fdo#61453 fix truncation on German UI

Change-Id: I4ec173dc2856a6208f1149a5a9cbfc18873d1f2e
---
M sfx2/source/dialog/mgetempl.src
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/sfx2/source/dialog/mgetempl.src b/sfx2/source/dialog/mgetempl.src
index 218883d..ac03fb0 100644
--- a/sfx2/source/dialog/mgetempl.src
+++ b/sfx2/source/dialog/mgetempl.src
@@ -43,7 +43,7 @@
 MultiLineEdit MLE_NAME
 {
 Pos = MAP_APPFONT ( 70 , 8  ) ;
-Size = MAP_APPFONT ( 80 , 12 ) ;
+Size = MAP_APPFONT ( 184 , 12 ) ;
 Border = FALSE;
 ReadOnly = TRUE;
 Hide = TRUE;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4ec173dc2856a6208f1149a5a9cbfc18873d1f2e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Andras Timar ati...@suse.com

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - filter/inc filter/source sw/qa sw/source writerfilter/source

2013-02-28 Thread Miklos Vajna

 filter/inc/filter/msfilter/rtfutil.hxx |   23 ++--
 filter/source/msfilter/rtfutil.cxx |   47 ++---
 sw/qa/extras/rtfexport/data/fdo61507.rtf   |   12 ++
 sw/qa/extras/rtfexport/rtfexport.cxx   |   19 ++
 sw/source/filter/ww8/rtfexport.cxx |   15 +--
 sw/source/filter/ww8/rtfexport.hxx |2 -
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   25 ++---
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |1 
 8 files changed, 125 insertions(+), 19 deletions(-)

New commits:
commit 3209bc81245452ef6976c77818186b05c3026438
Author: Miklos Vajna vmik...@suse.cz
Date:   Tue Feb 26 15:36:09 2013 +0100

fdo#61507 import/export RTF_UPR and RTF_UD

In short, these commits make the RTF filter import and export unicode
characters in document title properly. Previously we failed to import
such files from Word, and the export result caused problems in Wordpad
(Word handled it fine).

(cherry picked from commits 0805b222f87bf99ec0c53ca678d1c670eb5293a2,
3a934d928e455eca38f124072c20a624a64aa225 and
5de52551a963b932cc23c2ea75f709fa1924520b)

Change-Id: Ic9417d0f23d44149acb3ae3dc9d4c281058a1b36
Reviewed-on: https://gerrit.libreoffice.org/2436
Tested-by: CaolÃ¡n McNamara caol...@redhat.com
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/filter/inc/filter/msfilter/rtfutil.hxx 
b/filter/inc/filter/msfilter/rtfutil.hxx
index 6f5d82c..aa842fd 100644
--- a/filter/inc/filter/msfilter/rtfutil.hxx
+++ b/filter/inc/filter/msfilter/rtfutil.hxx
@@ -41,10 +41,27 @@ namespace rtfutil {
 MSFILTER_DLLPUBLIC OString OutHex(sal_uLong nHex, sal_uInt8 nLen);
 
 /// Handles correct unicode and legacy export of a single character.
-MSFILTER_DLLPUBLIC OString OutChar(sal_Unicode c, int *pUCMode, 
rtl_TextEncoding eDestEnc);
+MSFILTER_DLLPUBLIC OString OutChar(sal_Unicode c, int *pUCMode, 
rtl_TextEncoding eDestEnc, bool* pSuccess = 0, bool bUnicode = true);
 
-/// Handles correct unicode and legacy export of a string.
-MSFILTER_DLLPUBLIC OString OutString(const String rStr, rtl_TextEncoding 
eDestEnc);
+/**
+ * Handles correct unicode and legacy export of a string.
+ *
+ * @param rStr the string to export
+ * @param eDestEnc the legacy encoding to use
+ * @param bUnicode if unicode output is wanted as well, or just legacy
+ */
+MSFILTER_DLLPUBLIC OString OutString(const String rStr, rtl_TextEncoding 
eDestEnc, bool bUnicode = true);
+
+/**
+ * Handles correct unicode and legacy export of a string, when a
+ * '{' \upr '{' keyword ansi_text '}{\*' \ud '{' keyword Unicode_text '}}}'
+ * construct should be used.
+ *
+ * @param pToken the keyword
+ * @param rStr the text to export
+ * @param eDestEnc the legacy encoding to use
+ */
+MSFILTER_DLLPUBLIC OString OutStringUpr(const sal_Char *pToken, const String 
rStr, rtl_TextEncoding eDestEnc);
 
 }
 }
diff --git a/filter/source/msfilter/rtfutil.cxx 
b/filter/source/msfilter/rtfutil.cxx
index ebb72bd..3e2dfb0 100644
--- a/filter/source/msfilter/rtfutil.cxx
+++ b/filter/source/msfilter/rtfutil.cxx
@@ -53,8 +53,10 @@ OString OutHex(sal_uLong nHex, sal_uInt8 nLen)
 return OString(pStr);
 }
 
-OString OutChar(sal_Unicode c, int *pUCMode, rtl_TextEncoding eDestEnc)
+OString OutChar(sal_Unicode c, int *pUCMode, rtl_TextEncoding eDestEnc, bool* 
pSuccess, bool bUnicode)
 {
+if (pSuccess)
+*pSuccess = true;
 OStringBuffer aBuf;
 const sal_Char* pStr = 0;
 // 0x0b instead of \n, etc because of the replacements in 
SwWW8AttrIter::GetSnippet()
@@ -91,10 +93,13 @@ OString OutChar(sal_Unicode c, int *pUCMode, 
rtl_TextEncoding eDestEnc)
 else {
 OUString sBuf(c, 1);
 OString sConverted;
-sBuf.convertToString(sConverted, eDestEnc, 
OUSTRING_TO_OSTRING_CVTFLAGS);
+if (pSuccess)
+*pSuccess = sBuf.convertToString(sConverted, eDestEnc, 
RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR | 
RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR);
+else
+sBuf.convertToString(sConverted, eDestEnc, 
OUSTRING_TO_OSTRING_CVTFLAGS);
 const sal_Int32 nLen = sConverted.getLength();
 
-if (pUCMode)
+if (pUCMode  bUnicode)
 {
 if (*pUCMode != nLen)
 {
@@ -130,13 +135,13 @@ OString OutChar(sal_Unicode c, int *pUCMode, 
rtl_TextEncoding eDestEnc)
 return aBuf.makeStringAndClear();
 }
 
-OString OutString(const String rStr, rtl_TextEncoding eDestEnc)
+OString OutString(const String rStr, rtl_TextEncoding eDestEnc, bool bUnicode)
 {
 SAL_INFO(filter.ms, OSL_THIS_FUNC  , rStr = '  OUString(rStr)  
');
 OStringBuffer aBuf;
 int nUCMode = 1;
 for (xub_StrLen n = 0; n  rStr.Len(); ++n)
-aBuf.append(OutChar(rStr.GetChar(n), nUCMode, eDestEnc));
+aBuf.append(OutChar(rStr.GetChar(n),

Re: Developer Input - FDO#30671 - slide transitions appears to use GL_DOUBLE vertices

2013-02-28 Thread Joel Madero


On 02/28/2013 04:16 AM, Caolán McNamara wrote:

On Mon, 2012-10-15 at 11:20 -0700, Joel Madero wrote:

This is one of our oldest unconfirmed bugs (2 years!). I think we need
developer input on it as it's not clear if the user's point has any
real impact on the project. Can one of you check it out and let me
know if we can close it or move it forward as a confirmed bug (seems
more like enhancement though)

Meh, lets give up on it, closed/wontfix. Presumably converting from
double to float just at the point of insertion into opengl gains
nothing, and e.g. reworking B2DTuple and friends to floats seems
impracticable.

C.


Excellent, now time to start pushing the next oldest bug ;)


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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sfx2/source

 sfx2/source/dialog/mgetempl.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 916957b42a6f2ac5b82e90856961ebcc54f8e799
Author: Andras Timar ati...@suse.com
Date:   Thu Feb 28 16:00:00 2013 +0100

fdo#61453 fix truncation on German UI

Change-Id: I4ec173dc2856a6208f1149a5a9cbfc18873d1f2e
Reviewed-on: https://gerrit.libreoffice.org/2469
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/sfx2/source/dialog/mgetempl.src b/sfx2/source/dialog/mgetempl.src
index 218883d..ac03fb0 100644
--- a/sfx2/source/dialog/mgetempl.src
+++ b/sfx2/source/dialog/mgetempl.src
@@ -43,7 +43,7 @@ TabPage TP_MANAGE_STYLES
 MultiLineEdit MLE_NAME
 {
 Pos = MAP_APPFONT ( 70 , 8  ) ;
-Size = MAP_APPFONT ( 80 , 12 ) ;
+Size = MAP_APPFONT ( 184 , 12 ) ;
 Border = FALSE;
 ReadOnly = TRUE;
 Hide = TRUE;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-0] fdo#61453 fix truncation on German UI

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/2469

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4ec173dc2856a6208f1149a5a9cbfc18873d1f2e
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Andras Timar ati...@suse.com
Gerrit-Reviewer: Caolán McNamara caol...@redhat.com

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

[PATCH] RTL_CONSTASCII_USTRINGPARAM and ::rtl:: removals

2013-02-28 Thread Krisztian Pinter (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2470

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/70/2470/1

RTL_CONSTASCII_USTRINGPARAM and ::rtl:: removals

Change-Id: Ief6418425676d6943993513c4d05c8d22e4740cf
---
M framework/inc/framework/addonsoptions.hxx
M framework/inc/framework/menuconfiguration.hxx
M framework/inc/macros/generic.hxx
M framework/inc/properties.h
M framework/source/classes/menumanager.cxx
M framework/source/dispatch/popupmenudispatcher.cxx
M framework/source/fwe/classes/actiontriggercontainer.cxx
M framework/source/fwe/classes/actiontriggerpropertyset.cxx
M framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
M framework/source/fwe/classes/addonmenu.cxx
M framework/source/fwe/classes/addonsoptions.cxx
M framework/source/fwe/classes/bmkmenu.cxx
M framework/source/fwe/classes/rootactiontriggercontainer.cxx
M framework/source/fwe/helper/actiontriggerhelper.cxx
M framework/source/fwe/helper/propertysetcontainer.cxx
M framework/source/fwe/helper/titlehelper.cxx
M framework/source/fwe/helper/undomanagerhelper.cxx
M framework/source/fwe/interaction/preventduplicateinteraction.cxx
M framework/source/fwe/xml/menudocumenthandler.cxx
M framework/source/fwe/xml/saxnamespacefilter.cxx
M framework/source/fwe/xml/statusbardocumenthandler.cxx
M framework/source/fwe/xml/toolboxdocumenthandler.cxx
M framework/source/fwe/xml/xmlnamespaces.cxx
M framework/source/fwi/jobs/jobconst.cxx
M framework/source/fwi/uielement/constitemcontainer.cxx
M framework/source/fwi/uielement/itemcontainer.cxx
M framework/source/fwi/uielement/rootitemcontainer.cxx
M framework/source/layoutmanager/helpers.cxx
M framework/source/layoutmanager/helpers.hxx
M framework/source/layoutmanager/toolbarlayoutmanager.cxx
M framework/source/services/backingwindow.cxx
M framework/source/services/pathsettings.cxx
M framework/source/services/substitutepathvars.cxx
M framework/source/services/taskcreatorsrv.cxx
M framework/source/tabwin/tabwindow.cxx
M framework/source/tabwin/tabwinfactory.cxx
M framework/source/uiconfiguration/globalsettings.cxx
M framework/source/uiconfiguration/moduleuicfgsupplier.cxx
M framework/source/uielement/addonstoolbarmanager.cxx
M framework/source/uielement/comboboxtoolbarcontroller.cxx
M framework/source/uielement/dropdownboxtoolbarcontroller.cxx
M framework/source/uielement/edittoolbarcontroller.cxx
M framework/source/uielement/headermenucontroller.cxx
M framework/source/uielement/imagebuttontoolbarcontroller.cxx
M framework/source/uielement/langselectionstatusbarcontroller.cxx
M framework/source/uielement/popupmenucontroller.cxx
M framework/source/uielement/recentfilesmenucontroller.cxx
M framework/source/uielement/simpletextstatusbarcontroller.cxx
M framework/source/uielement/spinfieldtoolbarcontroller.cxx
M framework/source/uielement/statusbarmanager.cxx
M framework/source/uielement/togglebuttontoolbarcontroller.cxx
M framework/source/uielement/toolbarsmenucontroller.cxx
M framework/source/uifactory/addonstoolboxfactory.cxx
M framework/source/uifactory/factoryconfiguration.cxx
M framework/source/uifactory/menubarfactory.cxx
M framework/source/uifactory/popupmenucontrollerfactory.cxx
M framework/source/uifactory/statusbarcontrollerfactory.cxx
M framework/source/uifactory/toolbarcontrollerfactory.cxx
M framework/source/uifactory/uielementfactorymanager.cxx
M framework/source/uifactory/windowcontentfactorymanager.cxx
M framework/source/xml/imagesdocumenthandler.cxx
61 files changed, 1,502 insertions(+), 1,503 deletions(-)




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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief6418425676d6943993513c4d05c8d22e4740cf
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Krisztian Pinter pin.termina...@gmail.com

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

[Libreoffice-commits] core.git: dbaccess/source

2013-02-28 Thread Gergő Mocsi

 dbaccess/source/sdbtools/connection/objectnames.cxx |   14 +-
 dbaccess/source/sdbtools/connection/tablename.cxx   |   28 ++--
 2 files changed, 21 insertions(+), 21 deletions(-)

New commits:
commit d5f12bfbf97e179ca45476bb7faf275bdf26f5ca
Author: GergÅ Mocsi gmocs...@gmail.com
Date:   Fri Feb 22 01:54:27 2013 +0100

fdo#38838, String to OUString in module dbaccess/source/sdbtools/connection

Replaced String to OUString, plus deleted deprecated macro 
RTL_CONSTASCII_USTRINGPARAM

Change-Id: I4464644df8c42692aed7cb078b5f77c482e615f4
Reviewed-on: https://gerrit.libreoffice.org/2380
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/dbaccess/source/sdbtools/connection/objectnames.cxx 
b/dbaccess/source/sdbtools/connection/objectnames.cxx
index 05c1db0..68e13f1 100644
--- a/dbaccess/source/sdbtools/connection/objectnames.cxx
+++ b/dbaccess/source/sdbtools/connection/objectnames.cxx
@@ -114,7 +114,7 @@ namespace sdbtools
 ::dbtools::DatabaseMetaData aMeta( m_xConnection );
 if ( aMeta.supportsSubqueriesInFrom() )
 {
-String sNeedDistinctNames( SdbtRes( 
STR_QUERY_AND_TABLE_DISTINCT_NAMES ) );
+OUString sNeedDistinctNames( SdbtRes( 
STR_QUERY_AND_TABLE_DISTINCT_NAMES ) );
 aError.NextException = SQLException( sNeedDistinctNames, 
m_xConnection, OUString(), 0, Any() );
 }
 
@@ -313,7 +313,7 @@ namespace sdbtools
   ( _nCommandType != CommandType::QUERY )
 )
 throw IllegalArgumentException(
-String( SdbtRes( STR_INVALID_COMMAND_TYPE ) ),
+OUString( SdbtRes( STR_INVALID_COMMAND_TYPE ) ),
 NULL,
 0
 );
@@ -337,7 +337,7 @@ namespace sdbtools
 catch( const Exception )
 {
 throw IllegalArgumentException(
-String( SdbtRes( STR_CONN_WITHOUT_QUERIES_OR_TABLES ) ),
+OUString( SdbtRes( STR_CONN_WITHOUT_QUERIES_OR_TABLES ) ),
 NULL,
 0
 );
@@ -413,13 +413,13 @@ namespace sdbtools
 
 PNameValidation pNameCheck( NameCheckFactory::createExistenceCheck( 
getContext(), _CommandType, getConnection() ) );
 
-String sBaseName( _BaseName );
-if ( sBaseName.Len() == 0 )
+OUString sBaseName( _BaseName );
+if ( sBaseName.isEmpty() )
 {
 if ( _CommandType == CommandType::TABLE )
-sBaseName = String( SdbtRes( STR_BASENAME_TABLE ) );
+sBaseName = OUString( SdbtRes( STR_BASENAME_TABLE ) );
 else
-sBaseName = String( SdbtRes( STR_BASENAME_QUERY ) );
+sBaseName = OUString( SdbtRes( STR_BASENAME_QUERY ) );
 }
 
 OUString sName( sBaseName );
diff --git a/dbaccess/source/sdbtools/connection/tablename.cxx 
b/dbaccess/source/sdbtools/connection/tablename.cxx
index ce4c196..2c32044 100644
--- a/dbaccess/source/sdbtools/connection/tablename.cxx
+++ b/dbaccess/source/sdbtools/connection/tablename.cxx
@@ -64,9 +64,9 @@ namespace sdbtools
 {
 SdbtClient  m_aModuleClient;// keep the module alive as long 
as this instance lives
 
-::rtl::OUString sCatalog;
-::rtl::OUString sSchema;
-::rtl::OUString sName;
+OUString sCatalog;
+OUString sSchema;
+OUString sName;
 };
 
 //
@@ -89,49 +89,49 @@ namespace sdbtools
 }
 
 //
-::rtl::OUString SAL_CALL TableName::getCatalogName() throw 
(RuntimeException)
+OUString SAL_CALL TableName::getCatalogName() throw (RuntimeException)
 {
 EntryGuard aGuard( *this );
 return m_pImpl-sCatalog;
 }
 
 //
-void SAL_CALL TableName::setCatalogName( const ::rtl::OUString 
_catalogName ) throw (RuntimeException)
+void SAL_CALL TableName::setCatalogName( const OUString _catalogName ) 
throw (RuntimeException)
 {
 EntryGuard aGuard( *this );
 m_pImpl-sCatalog = _catalogName;
 }
 
 //
-::rtl::OUString SAL_CALL TableName::getSchemaName() throw 
(RuntimeException)
+OUString SAL_CALL TableName::getSchemaName() throw (RuntimeException)
 {
 EntryGuard aGuard( *this );
 return m_pImpl-sSchema;
 }
 
 //
-void SAL_CALL TableName::setSchemaName( const ::rtl::OUString _schemaName 
) throw (RuntimeException)
+void SAL_CALL TableName::setSchemaName( const OUString _schemaName ) 
throw (RuntimeException)
 {
 EntryGuard aGuard( *this

[PUSHED] fdo#38838, String to OUString in module dbaccess/source/sdbt...

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/2380

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4464644df8c42692aed7cb078b5f77c482e615f4
Gerrit-PatchSet: 4
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Gergő Mocsi gmocs...@gmail.com
Gerrit-Reviewer: Caolán McNamara caol...@redhat.com
Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org

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

[Libreoffice-commits] core.git: comphelper/inc connectivity/source embeddedobj/source odk/examples svx/source xmloff/dtd

2013-02-28 Thread Julien Nabet

 comphelper/inc/comphelper/embeddedobjectcontainer.hxx| 
   2 +-
 connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx | 
   6 +++---
 embeddedobj/source/commonembedding/persistence.cxx   | 
   6 +++---
 embeddedobj/source/general/dummyobject.cxx   | 
   2 +-
 embeddedobj/source/msole/olepersist.cxx  | 
   6 +++---
 odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.java| 
   4 ++--
 svx/source/unodraw/unoshape.cxx  | 
   4 ++--
 xmloff/dtd/table.mod | 
   2 +-
 8 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit c13802e009035a22b9d38a045c7feb15b1c659a7
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sat Feb 23 15:06:20 2013 +0100

Fix typo persistant - persistant

Change-Id: I639afec2508d189c10a180fd8f824e634afbd14a
Reviewed-on: https://gerrit.libreoffice.org/2347
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/comphelper/inc/comphelper/embeddedobjectcontainer.hxx 
b/comphelper/inc/comphelper/embeddedobjectcontainer.hxx
index f9b7bd9..2312b2d 100644
--- a/comphelper/inc/comphelper/embeddedobjectcontainer.hxx
+++ b/comphelper/inc/comphelper/embeddedobjectcontainer.hxx
@@ -100,7 +100,7 @@ public:
 CreateEmbeddedObject( const 
com::sun::star::uno::Sequence  sal_Int8 ,
 const com::sun::star::uno::Sequence  
com::sun::star::beans::PropertyValue , ::rtl::OUString );
 
-// insert an embedded object into the container - objects persistant 
representation will be added to the storage
+// insert an embedded object into the container - objects persistent 
representation will be added to the storage
 sal_BoolInsertEmbeddedObject( const 
::com::sun::star::uno::Reference  ::com::sun::star::embed::XEmbeddedObject , 
::rtl::OUString );
 
 // load an embedded object from a MediaDescriptor and insert it into the 
container
diff --git 
a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx 
b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx
index c00249d..b3e52c6 100644
--- 
a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx
+++ 
b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx
@@ -104,16 +104,16 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsProfileDirServiceProvider,
 // nsProfileDirServiceProvider::nsIDirectoryServiceProvider
 
 NS_IMETHODIMP
-nsProfileDirServiceProvider::GetFile(const char *prop, PRBool *persistant, 
nsIFile **_retval)
+nsProfileDirServiceProvider::GetFile(const char *prop, PRBool *persistent, 
nsIFile **_retval)
 {
   NS_ENSURE_ARG(prop);
-  NS_ENSURE_ARG_POINTER(persistant);
+  NS_ENSURE_ARG_POINTER(persistent);
   NS_ENSURE_ARG_POINTER(_retval);
 
   if (!mProfileDir)
 return NS_ERROR_FAILURE;
 
-  *persistant = PR_TRUE;
+  *persistent = PR_TRUE;
   nsIFile* domainDir = mProfileDir;
 
 
diff --git a/embeddedobj/source/commonembedding/persistence.cxx 
b/embeddedobj/source/commonembedding/persistence.cxx
index 7899567..b7e61e4 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -937,13 +937,13 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry(
( m_nObjectState == -1 || nEntryConnectionMode != 
embed::EntryInitModes::NO_INIT ) )
 {
 // if the object is not loaded
-// it can not get persistant representation without initialization
+// it can not get persistent representation without initialization
 
 // if the object is loaded
-// it can switch persistant representation only without initialization
+// it can switch persistent representation only without initialization
 
 throw embed::WrongStateException(
-::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( Can't change 
persistant representation of activated object!\n )),
+::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( Can't change 
persistent representation of activated object!\n )),
 uno::Reference uno::XInterface ( static_cast 
::cppu::OWeakObject* (this) ) );
 }
 
diff --git a/embeddedobj/source/general/dummyobject.cxx 
b/embeddedobj/source/general/dummyobject.cxx
index 057fe8a..8c309d0 100644
--- a/embeddedobj/source/general/dummyobject.cxx
+++ b/embeddedobj/source/general/dummyobject.cxx
@@ -324,7 +324,7 @@ void SAL_CALL ODummyEmbeddedObject::setPersistentEntry(
( m_nObjectState == -1 || nEntryConnectionMode != 
embed::EntryInitModes::NO_INIT ) )
 {
 throw embed::WrongStateException(
-::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( Can't change 
persistant representation of

[PUSHED] Fix typo persistant - persistant

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/2347

Approvals:
  Michael Stahl: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I639afec2508d189c10a180fd8f824e634afbd14a
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet serval2...@yahoo.fr
Gerrit-Reviewer: Julien Nabet serval2...@yahoo.fr
Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com
Gerrit-Reviewer: Michael Stahl mst...@redhat.com
Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org

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

[Libreoffice-commits] dev-tools.git: 2 commits - scripts/annotate.pl scripts/aoo-annotate.pl

 scripts/annotate.pl |  235 
 scripts/aoo-annotate.pl |  153 ---
 2 files changed, 235 insertions(+), 153 deletions(-)

New commits:
commit 56fd9e74b4a085e504ca3f43497a7a7e5a516383
Author: Michael Meeks michael.me...@suse.com
Date:   Thu Feb 28 16:15:39 2013 +

rename.

diff --git a/scripts/annotate.pl b/scripts/annotate.pl
new file mode 100755
index 000..9fe42e4
--- /dev/null
+++ b/scripts/annotate.pl
@@ -0,0 +1,235 @@
+#!/usr/bin/perl -w
+
+use strict;
+
+my %valid_reasons = (
+'ignore' = 1,
+'merged as' = 1,
+'prefer' = 1,
+'reject' = 1
+);
+
+sub clean_note($)
+{
+my $note = shift;
+chomp ($note); # ideally sanitise to pull out our notes ...
+$note =~ m/\n/  die multi-line note\n;
+return $note;
+}
+
+sub fetch_git_notes($)
+{
+my $git_dir = shift;
+`(cd '$git_dir'; git --no-pager fetch origin 
refs/notes/commits:refs/notes/commits)`;
+}
+
+sub push_git_notes($)
+{
+my $git_dir = shift;
+`(cd '$git_dir'; git --no-pager push origin 
refs/notes/commits:refs/notes/commits)`;
+}
+
+# starts with a git hash;
+sub validate_git_hash($)
+{
+my $hash = shift;
+return 0 if (! ($hash =~ m/^([0-9a-fA-F]{40})/) );
+return 1;
+}
+
+sub validate_check_note($)
+{
+my $note_text = shift;
+$note_text =~ m/^(\S+):\s+(.+)$/ || die note: '$note_text' is missing a 
explanation: reason;
+my $reason = $1;
+my $expl = $2;
+
+if (!defined $valid_reasons{$reason}) {
+   my @reasons = keys %valid_reasons;
+   print STDERR Invalid reason: '$reason' - valid reasons are @reasons\n;
+   exit 1;
+} elsif ($reason eq 'merged as' || $reason eq 'prefer') {
+   validate_git_hash($expl) ||
+   die reason '$reason' must have an explanation beginning with a git 
hash\n;
+}
+}
+
+sub read_log($)
+{
+my $git_dir = shift;
+my @revisions;
+my $outputh;
+
+#print STDERR read revisions:\n;
+open ($outputh, cd '$git_dir' ; git --no-pager log 
--pretty='%H,%cn,%ce,%cd,%s%N' aoo/approx-3.4.0..origin/aoo/trunk|) || 
die can't get git log: $!;
+while ($outputh) {
+   my $line = $_;
+   chomp ($line);
+#  print STDERR line '$line'\n;
+   my %commit;
+   $line =~ s/^(\S+),([^,]+),([^,]+),([^,]+),(.*)(.*)$// || die 
badly formatted line: $line;
+   $commit{hash} = $1;
+   $commit{name} = $2;
+   $commit{email} = $3;
+   $commit{date} = $4;
+   $commit{subject} = $5;
+   my $note = $6;
+
+#  print STDERR here - note is $note\n;
+   while (1) {
+#  print STDERR note: $note;
+   if ($note =~ s///) {
+#  print STDERR no match !;
+   last;
+   } else {
+   $note = $note . readline $outputh;
+   }
+   }
+
+   $commit{note} = clean_note($note);
+   push @revisions, \%commit;
+}
+close ($outputh);
+
+return \@revisions;
+}
+
+sub dump_breakdown($)
+{
+my $revs = shift;
+
+my $rev_count = scalar (@{$revs});
+my $annotated = 0;
+my %frequency;
+my $contiguous = 0;
+my $in_start_run = 1;
+for my $rev (reverse @{$revs}) {
+   if($rev-{note} ne ) {
+   my $stem = $rev-{note};
+   $stem =~ s/^merged as.*$/merged as:/;
+   $stem =~ s/^prefer.*$/prefer:/;
+   $stem =~ s/^reject.*$/reject:/;
+   $frequency{$stem} = 0 if (!defined $frequency{$stem});
+   $frequency{$stem}++;
+   $annotated++;
+   $contiguous++ if ($in_start_run);
+   } else {
+   $in_start_run = 0;
+   }
+}
+
+print $annotated annotations of $rev_count commits\n;
+for my $stem (sort { $frequency{$b} = $frequency{$a} } keys %frequency) {
+   print $frequency{$stem}\t$stem\n;
+}
+print contiguous annotations: $contiguous\n;
+}
+
+sub sanity_check_revs($$)
+{
+my $git_dir = shift;
+my $revs = shift;
+my $note_count = 0;
+for my $rev (@{$revs}) {
+   my $note = $rev-{note};
+   $note_count++ if ($note ne );
+}
+if ($note_count  100) {
+   print STDERR It looks as if you have not fetched your git notes please 
do\n;
+   print STDERR ( cd $git_dir ; git fetch origin 
refs/notes/commits:refs/notes/commits )\n;
+   exit 1;
+}
+}
+
+sub usage()
+{
+print STDERR Usage: aoo-annotate.pl [args] [--git /path/to/git] ['merged 
as: 1234' hash]\n;
+print STDERR annotate AOO commits as to their status\n;
+print STDERR \n;
+print STDERR   -a, --all list all commits regardless of status\n;
+print STDERR   -g, --git d pass a path to a git repository [default is 
cwd]\n;
+print STDERR   -l, --listlist all un-annotated commits\n;
+print STDERR   -n, --notes   list just commits with notes\n;
+print STDERR   -h, --helpshow this\n;
+print STDERR   -s, --stats   show stats on merging\n;
+print STDERR   -f, --fetch   fetch latest

[Libreoffice-commits] core.git: solenv/README solenv/src

 solenv/README  |5 -
 solenv/src/component.map   |   23 ---
 solenv/src/reg-component.map   |   24 
 solenv/src/solaris_noexstk.map |   21 -
 solenv/src/unloadablecomponent.map |   24 
 5 files changed, 97 deletions(-)

New commits:
commit 6b7595c57228e86447dbd638a95bc35b55e67180
Author: MatÃºÅ¡ Kukan matus.ku...@gmail.com
Date:   Thu Feb 28 17:29:55 2013 +0100

rm -r solenv/src

Change-Id: Ie38efcb040ce8f5f02d32bb1375215b816fe46e6

diff --git a/solenv/README b/solenv/README
index 983b4c6..975c8bf 100644
--- a/solenv/README
+++ b/solenv/README
@@ -32,8 +32,3 @@ gdb/
 inc/
old / increasingly obsolete dmake setup and includes, we are
trying to entirely rid ourselves of this
-
-src/
-   useful standard / re-usable component map files for components
-   which shouldn't export anything more than a few registration
-   symbols.
diff --git a/solenv/src/component.map b/solenv/src/component.map
deleted file mode 100644
index db10831..000
--- a/solenv/src/component.map
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the License); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-UDK_3_0_0 {
-global:
-component_getFactory;
-local:
-*;
-};
diff --git a/solenv/src/reg-component.map b/solenv/src/reg-component.map
deleted file mode 100644
index a071966..000
--- a/solenv/src/reg-component.map
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the License); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-UDK_3_0_0 {
-global:
-component_writeInfo;
-component_getFactory;
-local:
-*;
-};
diff --git a/solenv/src/solaris_noexstk.map b/solenv/src/solaris_noexstk.map
deleted file mode 100644
index 27fdb9c..000
--- a/solenv/src/solaris_noexstk.map
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the License); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-# mapfile for non-executable stack
-# see @ /usr/lib/ld/map.noexstk
-#
-stack = STACK ?RW;
diff --git a/solenv/src/unloadablecomponent.map 
b/solenv/src/unloadablecomponent.map
deleted file mode 100644
index 5ea17d0..000
--- a/solenv/src/unloadablecomponent.map
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for

[PATCH] let rsc create dep file for all platforms

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2471

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/71/2471/1

let rsc create dep file for all platforms

Change-Id: Ic2406c548c013d381a5b22f514d4807877230251
---
M solenv/gbuild/AllLangResTarget.mk
M solenv/gbuild/platform/com_GCC_class.mk
M solenv/gbuild/platform/com_MSC_class.mk
3 files changed, 1 insertion(+), 39 deletions(-)



diff --git a/solenv/gbuild/AllLangResTarget.mk 
b/solenv/gbuild/AllLangResTarget.mk
index b06a8da..9bcfd09 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -83,9 +83,6 @@
 
 # SrsPartTarget class
 
-# defined by platform
-#  gb_SrsPartTarget__command_dep
-
 gb_ResTarget_RSCDEPS := $(call gb_Executable_get_runtime_dependencies,rsc)
 gb_ResTarget_RSCCOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(call 
gb_Executable_get_command,rsc)
 
@@ -105,8 +102,7 @@
 endef
 
 $(call gb_SrsPartTarget_get_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY) \
-   $(gb_ResTarget_RSCDEPS) $(gb_SrsPartTarget__command_target)
-   $(call gb_SrsPartTarget__command_dep,$*,$)
+   $(gb_ResTarget_RSCDEPS)
$(call gb_SrsPartTarget__command,$@,$*,$)
 
 ifeq ($(gb_FULLDEPS),$(true))
diff --git a/solenv/gbuild/platform/com_GCC_class.mk 
b/solenv/gbuild/platform/com_GCC_class.mk
index 4ea1a14..8470a0c 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -170,17 +170,6 @@
$(INCLUDE))
 endef
 
-define gb_SrsPartTarget__command_dep
-$(call gb_Helper_abbreviate_dirs,\
-   mkdir -p $(dir $(call gb_SrsPartTarget_get_dep_target,$(1)))  cd 
$(SRCDIR)  \
-   $(gb_GCCP) \
-   -MM -MT $(call gb_SrsPartTarget_get_target,$(1)) \
-   $(INCLUDE) \
-   $(DEFS) \
-   -c -x c++-header $(2) \
-   -o $(call gb_SrsPartTarget_get_dep_target,$(1)))
-endef
-
 ifeq ($(COM_GCC_IS_CLANG),TRUE)
 # PrecompiledHeader class
 
diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index e2cfc49..e16d738 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -459,29 +459,6 @@
 
 endef
 
-# SrsPartTarget class
-
-ifeq ($(gb_FULLDEPS),$(true))
-gb_SrsPartTarget__command_target = $(OUTDIR)/bin/makedepend$(gb_Executable_EXT)
-define gb_SrsPartTarget__command_dep
-$(call gb_Helper_abbreviate_dirs,\
-   $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
-   $(INCLUDE) \
-   $(DEFS) \
-   $(2) \
-   -f - \
-   | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
-   -v OBJECTFILE=$(call gb_SrsPartTarget_get_target,$(1)) \
-   -v OUTDIR=$(OUTDIR)/ \
-   -v WORKDIR=$(WORKDIR)/ \
-   -v SRCDIR=$(SRCDIR)/ \
-$(call gb_SrsPartTarget_get_dep_target,$(1)))
-endef
-else
-gb_SrsPartTarget__command_target =
-gb_SrsPartTarget__command_dep =
-endif
-
 # WinResTarget class
 
 gb_WinResTarget_POSTFIX :=.res

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic2406c548c013d381a5b22f514d4807877230251
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matúš Kukan matus.ku...@gmail.com

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

[PATCH] gbuild: do not use gb_WinResTarget_get_dep_target

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2472

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/72/2472/1

gbuild: do not use gb_WinResTarget_get_dep_target

Change-Id: I7a198bff62c50a74f05ac6e1508f43a14610fd0d
---
M solenv/gbuild/WinResTarget.mk
M solenv/gbuild/platform/WNT_INTEL_GCC.mk
M solenv/gbuild/platform/com_MSC_class.mk
3 files changed, 1 insertion(+), 86 deletions(-)



diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk
index c280276..6bbf58e 100644
--- a/solenv/gbuild/WinResTarget.mk
+++ b/solenv/gbuild/WinResTarget.mk
@@ -17,21 +17,7 @@
 $(call gb_WinResTarget_get_clean_target,$(1)) : RCFILE :=
 $(call gb_WinResTarget_get_target,$(1)) : RCFILE :=
 
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_WinResTarget_get_dep_target,$(1)) : DEFS := 
$$(gb_WinResTarget_DEFAULTDEFS)
-$(call gb_WinResTarget_get_dep_target,$(1)) : INCLUDE := 
$$(gb_WinResTarget_INCLUDE)
-$(call gb_WinResTarget_get_dep_target,$(1)) : RCFILE :=
-
--include $(call gb_WinResTarget_get_dep_target,$(1))
-endif
-
 endef
-
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_WinResTarget_get_dep_target,%) : $(gb_WinResTarget__command_target)
-   $(call gb_WinResTarget__command_dep,$@,$*,$)
-endif
-
 
 $(call gb_WinResTarget_get_target,%) : $(call gb_Package_get_target,solenv_inc)
$(call gb_WinResTarget__command,$@,$*,$)
@@ -39,8 +25,7 @@
 $(call gb_WinResTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),RC ,3)
$(call gb_Helper_abbreviate_dirs,\
-   rm -f $(call gb_WinResTarget_get_target,$*) \
-   $(call gb_WinResTarget_get_dep_target,$*))
+   rm -f $(call gb_WinResTarget_get_target,$*))
 
 define gb_WinResTarget_set_defs
 $$(call gb_Output_error,gb_WinResTarget_set_defs: use gb_WinResTarget_add_defs 
instead.)
@@ -49,27 +34,15 @@
 define gb_WinResTarget_add_defs
 $(call gb_WinResTarget_get_target,$(1)) : DEFS += $(2)
 
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_WinResTarget_get_dep_target,$(1)) : DEFS += $(2)
-endif
-
 endef
 
 define gb_WinResTarget__add_include
 $(call gb_WinResTarget_get_target,$(1)) : INCLUDE += -I$(2)
 
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_WinResTarget_get_dep_target,$(1)) : INCLUDE += -I$(2)
-endif
-
 endef
 
 define gb_WinResTarget_set_include
 $(call gb_WinResTarget_get_target,$(1)) : INCLUDE := $(2)
-
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_WinResTarget_get_dep_target,$(1)) : INCLUDE := $(2)
-endif
 
 endef
 
@@ -81,10 +54,6 @@
 $(call gb_WinResTarget_get_clean_target,$(1)) : RCFILE := $(SRCDIR)/$(strip 
$(2)).rc
 $(call gb_WinResTarget_get_target,$(1)) : RCFILE := $(SRCDIR)/$(strip $(2)).rc
 $(call gb_WinResTarget_get_target,$(1)) : $(SRCDIR)/$(strip $(2)).rc
-
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_WinResTarget_get_dep_target,$(1)) : RCFILE := $(SRCDIR)/$(strip 
$(2)).rc
-endif
 
 endef
 
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk 
b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 0960643..9962c7d 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -353,33 +353,6 @@
$(RCFILE) )
 endef
 
-$(eval $(call gb_Helper_make_dep_targets,\
-   WinResTarget \
-))
-
-ifeq ($(gb_FULLDEPS),$(true))
-gb_WinResTarget__command_target = $(OUTDIR_FOR_BUILD)/bin/makedepend
-define gb_WinResTarget__command_dep
-$(call gb_Output_announce,RC:$(2),$(true),DEP,1)
-$(call gb_Helper_abbreviate_dirs,\
-   mkdir -p $(dir $(1))  \
-   $(OUTDIR_FOR_BUILD)/bin/makedepend \
-   $(INCLUDE) \
-   $(DEFS) \
-   $(RCFILE) \
-   -f - \
-   | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
-   -v OBJECTFILE=$(3) \
-   -v OUTDIR=$(OUTDIR)/ \
-   -v WORKDIR=$(WORKDIR)/ \
-   -v SRCDIR=$(SRCDIR)/ \
-$(1))
-endef
-else
-gb_WinResTarget__command_target =
-gb_WinResTarget__command_dep =
-endif
-
 # InstallModuleTarget class
 
 define gb_InstallModuleTarget_InstallModuleTarget_platform
diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index e16d738..3d4c9d5 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -475,33 +475,6 @@
$(RCFILE) )
 endef
 
-$(eval $(call gb_Helper_make_dep_targets,\
-   WinResTarget \
-))
-
-ifeq ($(gb_FULLDEPS),$(true))
-gb_WinResTarget__command_target = $(OUTDIR)/bin/makedepend$(gb_Executable_EXT)
-define gb_WinResTarget__command_dep
-$(call gb_Output_announce,RC:$(2),$(true),DEP,1)
-$(call gb_Helper_abbreviate_dirs,\
-   mkdir -p $(dir $(1))  \
-   $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
-   $(INCLUDE) \
-   $(DEFS) \
-   $(RCFILE) \
-   -f - \
-   | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
-   -v OBJECTFILE=$(3) \
-   -v OUTDIR=$(OUTDIR)/ \
-

minutes of ESC call ...

* Present
+ Norbert, David, Joel, Andras, Stephan, Kendy, Eike, Michael S,
  Astron, Petr, Lionel, Caolan, Thorsten, Michael M, Bjoern

* Completed Action Items
+ master / unordf bug-fix before pushing writer doc (Michael S)
+ tweak default assignee / mail alias to include 'un-assigned@' (Joel)
+ lovely visible 'Not Assigned's everywhere ...
+ poke docs team wrt. writing off-line help for impress-remote 
(Thorsten)
+ thanks Sophie !
+ ping Marc wrt. creating a page with certified consultants in
  alphabetical order with rates etc. (Joel)
+ full-word selection / editing ergonomics cf. UX-advise
  https://bugs.freedesktop.org/show_bug.cgi?id=46517
+ notabug (Michael S)
+ on-line update tweaks (Kendy)
= upgrade everything to 3.6.5
= upgrade all 3.*.0 - 4.0.0
+ done for two weeks
+ continue ns timestamp discussion  conclude (Stephan/Lionel/Thorsten)
+ best outcome is to break it completely incompatibly
+ some knock-on ODF / standardisation impact
+ minimal triage for good mentors for proposed easy hacks (Bjoern)
+ timed out on this AI

* Pending Action Items
+ send out next round of certification invitations 
(Stephan/Bjoern/Thorsten)
+ Bugzilla attachments not set to autodetect (Bjoern)
+ sent to Tollef - who is deadly busy just now.
**  + Update gsoc ideas page
  https://wiki.documentfoundation.org/Development/Gsoc/Ideas (all)
+ everybody should update their their tasks and add new ones
+ disable Rhino / Beanshell unless in experimental mode (Michael M)
+ helping out with code-pointers for UI bugs (Kendy)
+ [ pending ]
+ look at gradient / clipart issues (Michael)

* Release Engineering update (Petr)
+ 4.0.1 rc2 status
+ builds available, synching to mirrors
+ a slew of bugs included; please continue fixing.
+ 4.0.2 rc1 *next deadline*:
+ March 11th
+ 1 week + 1/2 from now.
+ 3.6.6 rc1 commit deadline 3 weeks out: Monday Mar 18

* UX input (Astron)
+ new icon for impress remote merged and pending 4.0.1 release

* final gnumake removal: status  thanks (Bjoern)
+ Some fantastic work here, we now build everthing in
  one gnumake process
+ http://skyfromme.wordpress.com/2013/02/28/one/
+ build dependency graphing in a post prj/ world (Stephan)
+ need a tool for dependency graphing
+ will we get new circular dependencies ?
+ no library linking will help and make will fail
  on circular deps (Norbert)
+ what is needed is a tool to parse the output of
  make -n -p - that dumps all the rules (Michael S)
+ not as obvious as build lists were (yet)
+ the build.lst's were rotting anyway (Stephan)
+ a lint tool for make -n -p would be nice (Michael S)
AI: + write the start of a that tool (Michael)
+ then remove the prj/build.lst and d.lst files.
+ parse only the linktarget pieces (Bjeorn)

* merging external changes (Michael)
+ tool in contrib/dev-tools/scripts/annotate.pl
+ all non-trivial patches require sign-off from relevant
  developer preferably ESC member and testing
+ and another sign-off for back-porting to -4-0

* decision / dropping stale xmerge filters (Andras)
+ drop the minimally functional / not installed ones (Caolan)
+ ActiveSync 3.5 (for win95), pocket word,
  minicalc, htmlsoff, wordsmith
+ written often as mini samples / proof of concept.
+ decision: drop the unused filters, but retain the xmerge
  framework itself

* Coverity progress (Markus/Norbert/Caolan)
+ new build up-loaded, it'd be nice if more people would
  register / help with the reports:
  http://scan.coverity.com/user_register.html project: 'LibreOffice'
+ then send your account details to Markus / Norbert.
+ making good progress  600 'high impact' reports left.
+ un-caught exception reports more or less useless, always
  somewhere an exception is not declared.

* Automated crash on import test results (Markus)
+ still hurt by the toolchain bug on SLES11
+ http://sourceware.org/bugzilla/show_bug.cgi?id=15167
AI: + chase temporary PTF for the server (Kendy)
+ not publish until we're confident there are no false-positive

* Certification Program (Stephan/Kendy/Bjoern)
+ sent out list to ESC of invitations, no objections now,
  in one week - Cert. Program guys will async.

[Libreoffice-commits] core.git: solenv/gbuild

 solenv/gbuild/WinResTarget.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1db45205a92318fa3f7662c2e90b4ccb20510cb1
Author: Michael Stahl mst...@redhat.com
Date:   Thu Feb 28 17:40:00 2013 +0100

gbuild: WinResTarget: for dependencies use the actual target

Hopefully fixes silly .d files that have makedepend as target.

Change-Id: I7ebf3c56187acc94f4374353db255cdbffa6df02

diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk
index c280276..fd1831e 100644
--- a/solenv/gbuild/WinResTarget.mk
+++ b/solenv/gbuild/WinResTarget.mk
@@ -29,7 +29,7 @@ endef
 
 ifeq ($(gb_FULLDEPS),$(true))
 $(call gb_WinResTarget_get_dep_target,%) : $(gb_WinResTarget__command_target)
-   $(call gb_WinResTarget__command_dep,$@,$*,$)
+   $(call gb_WinResTarget__command_dep,$@,$*,$(call 
gb_WinResTarget_get_target,%))
 endif
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/gbuild

 solenv/gbuild/WinResTarget.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 06768783eac941b619a376a82a1c22066a704911
Author: Michael Stahl mst...@redhat.com
Date:   Thu Feb 28 17:48:44 2013 +0100

gbuild: WinResTarget: try that again

Change-Id: Ib96447c402094b57102e2657546567c51192259c

diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk
index fd1831e..45b51ac 100644
--- a/solenv/gbuild/WinResTarget.mk
+++ b/solenv/gbuild/WinResTarget.mk
@@ -29,7 +29,7 @@ endef
 
 ifeq ($(gb_FULLDEPS),$(true))
 $(call gb_WinResTarget_get_dep_target,%) : $(gb_WinResTarget__command_target)
-   $(call gb_WinResTarget__command_dep,$@,$*,$(call 
gb_WinResTarget_get_target,%))
+   $(call gb_WinResTarget__command_dep,$@,$*,$(call 
gb_WinResTarget_get_target,$*))
 endif
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] some refinements on label configurations in writer

2013-02-28 Thread Winfried Donkers (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2473

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/73/2473/1

some refinements on label configurations in writer

Change-Id: I94ad02972b0fae1327f72a41373f34962452b8ef
---
M extras/source/labels/labels.xml
M sw/source/ui/envelp/labelcfg.cxx
M sw/source/ui/envelp/labfmt.cxx
M sw/source/ui/envelp/labfmt.hrc
M sw/source/ui/envelp/labfmt.src
M sw/source/ui/inc/labelcfg.hxx
6 files changed, 155 insertions(+), 164 deletions(-)



diff --git a/extras/source/labels/labels.xml b/extras/source/labels/labels.xml
index a9f81ba..8ed02b9 100644
--- a/extras/source/labels/labels.xml
+++ b/extras/source/labels/labels.xml
@@ -651,7 +651,7 @@
 measureS;4064;2117;3810;2117;467;1090;5;13;21000;29700/measure
 /label
 label id=L125
-nameJ8654 Miini Address/name
+nameJ8654 Mini Address/name
 measureS;4826;2540;4572;2540;975;2143;4;10;21000;29700/measure
 /label
 label id=L126
@@ -1199,7 +1199,7 @@
 measureS;4064;2117;3810;2117;467;1090;5;13;21000;29700/measure
 /label
 label id=L262
-nameL7652 Miini Address/name
+nameL7652 Mini Address/name
 measureS;4826;1693;4572;1693;975;1299;4;16;21000;29700/measure
 /label
 label id=L263
@@ -1207,7 +1207,7 @@
 measureS;4572;1693;2200;1270;2542;4902;4;12;21000;29700/measure
 /label
 label id=L264
-nameL7654 Miini Address/name
+nameL7654 Mini Address/name
 measureS;4826;2540;4572;2540;975;2143;4;10;21000;29700/measure
 /label
 label id=L265
diff --git a/sw/source/ui/envelp/labelcfg.cxx b/sw/source/ui/envelp/labelcfg.cxx
index 28d4074..785eff6 100644
--- a/sw/source/ui/envelp/labelcfg.cxx
+++ b/sw/source/ui/envelp/labelcfg.cxx
@@ -59,6 +59,18 @@
 return sTmp;
 }
 
+static SequenceOUString lcl_CreatePropertyNames(const OUString rPrefix)
+{
+SequenceOUString aProperties(2);
+OUString* pProperties = aProperties.getArray();
+for(sal_Int32 nProp = 0; nProp  2; nProp++)
+pProperties[nProp] = rPrefix;
+
+pProperties[ 0] += Name;
+pProperties[ 1] += Measure;
+return aProperties;
+}
+
 SwLabelConfig::SwLabelConfig() :
 ConfigItem(Office.Labels/Manufacturer)
 {
@@ -72,6 +84,7 @@
 OUString sName;
 OUString sMeasure;
 
+// fill m_aLabels and m_aManufacturers with the predefined labels
 res = reader.nextItem(
 xmlreader::XmlReader::TEXT_NONE, name, nsId);
 assert(res == xmlreader::XmlReader::RESULT_BEGIN 
@@ -105,7 +118,10 @@
 xmlreader::Span(RTL_CONSTASCII_STRINGPARAM(measure)));
 // Ending label mark
 lcl_assertEndingItem(reader);
-m_aLabels[sManufacturer][sName] = sMeasure;
+if ( m_aLabels.find( sManufacturer ) == m_aLabels.end() )
+m_aManufacturers.push_back( sManufacturer );
+m_aLabels[sManufacturer][sName].m_aMeasure = sMeasure;
+m_aLabels[sManufacturer][sName].m_bPredefined = true;
 }
 // Get next manufacturer or end
 res = reader.nextItem(
@@ -115,7 +131,35 @@
 xmlreader::XmlReader::TEXT_NONE, name, nsId);
 assert(res == xmlreader::XmlReader::RESULT_DONE);
 
-FillManufacturers();
+// add to m_aLabels and m_aManufacturers the custom labels
+const Sequencertl::OUString rMan = GetNodeNames( OUString() );
+const rtl::OUString* pMan = rMan.getConstArray();
+for ( sal_Int32 nMan = 0; nMan  rMan.getLength(); nMan++ )
+{
+sManufacturer = pMan[nMan];
+const SequenceOUString aLabels = GetNodeNames( sManufacturer );
+const OUString* pLabels = aLabels.getConstArray();
+for( sal_Int32 nLabel = 0; nLabel  aLabels.getLength(); nLabel++ )
+{
+OUString sPrefix( sManufacturer );
+sPrefix += /;
+sPrefix += pLabels[nLabel];
+sPrefix += /;
+SequenceOUString aPropNames = lcl_CreatePropertyNames( sPrefix );
+SequenceAny   aValues = GetProperties( aPropNames );
+const Any* pValues = aValues.getConstArray();
+if (aValues.getLength() = 1)
+if(pValues[0].hasValue())
+pValues[0] = sName;
+if (aValues.getLength() = 2)
+if(pValues[1].hasValue())
+pValues[1] = sMeasure;
+if ( m_aLabels.find( sManufacturer ) == m_aLabels.end() )
+m_aManufacturers.push_back( sManufacturer );
+m_aLabels[sManufacturer][sName].m_aMeasure = sMeasure;
+m_aLabels[sManufacturer][sName].m_bPredefined = false;
+}
+}
 }
 
 SwLabelConfig::~SwLabelConfig()
@@ -127,32 +171,6 @@
 
 void SwLabelConfig::Notify( const ::com::sun::star::uno::Sequence 
rtl::OUString  ) {}
 
-void SwLabelConfig::FillManufacturers()
-{
-m_aManufacturers.clear();
-for (std::map OUString,

[Libreoffice-commits] core.git: dbaccess/source

2013-02-28 Thread Lionel Elie Mamane

 dbaccess/source/core/api/CacheSet.cxx |3 ++-
 dbaccess/source/core/api/KeySet.cxx   |3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit a2db9096e2674bfb1cb125bf6036c990f35579e7
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Thu Feb 28 18:06:50 2013 +0100

fdo#61203 initialise m_aComposedTableName *before* trying to use it

Change-Id: Ie7a19bdfe9e7bc729a62191362ce0779d73385a0

diff --git a/dbaccess/source/core/api/CacheSet.cxx 
b/dbaccess/source/core/api/CacheSet.cxx
index 32ffb78..734989b 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -156,10 +156,11 @@ void OCacheSet::fillTableName(const 
ReferenceXPropertySet _xTable)  throw(SQL
 void SAL_CALL OCacheSet::insertRow( const ORowSetRow _rInsertRow,const 
connectivity::OSQLTable _xTable ) throw(SQLException, RuntimeException)
 {
 RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, dbaccess, ocke.jans...@sun.com, 
OCacheSet::insertRow );
-OUStringBuffer aSql(INSERT INTO  + m_aComposedTableName +  ( );
 ReferenceXPropertySet xSet(_xTable,UNO_QUERY);
 fillTableName(xSet);
 
+OUStringBuffer aSql(INSERT INTO  + m_aComposedTableName +  ( );
+
 // set values and column names
 ::rtl::OUStringBuffer aValues( VALUES ( );
 static ::rtl::OUString aPara(?,);
diff --git a/dbaccess/source/core/api/KeySet.cxx 
b/dbaccess/source/core/api/KeySet.cxx
index 6252eec..f252dc8 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -728,10 +728,11 @@ void OKeySet::executeUpdate(const ORowSetRow _rInsertRow 
,const ORowSetRow _rO
 void SAL_CALL OKeySet::insertRow( const ORowSetRow _rInsertRow,const 
connectivity::OSQLTable _xTable ) throw(SQLException, RuntimeException)
 {
 RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, dbaccess, ocke.jans...@sun.com, 
OKeySet::insertRow );
-OUStringBuffer aSql( INSERT INTO  + m_aComposedTableName +  ( );
 ReferenceXPropertySet xSet(_xTable,UNO_QUERY);
 fillTableName(xSet);
 
+OUStringBuffer aSql( INSERT INTO  + m_aComposedTableName +  ( );
+
 // set values and column names
 OUStringBuffer aValues(OUString( VALUES ( ));
 static OUString aPara(?,);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/README solenv/src

 solenv/README  |5 +
 solenv/src/component.map   |   23 +++
 solenv/src/reg-component.map   |   24 
 solenv/src/solaris_noexstk.map |   21 +
 solenv/src/unloadablecomponent.map |   24 
 5 files changed, 97 insertions(+)

New commits:
commit 4b750d5052b8e473f2ec4db48724f02deb497b78
Author: MatÃºÅ¡ Kukan matus.ku...@gmail.com
Date:   Thu Feb 28 18:17:57 2013 +0100

Revert rm -r solenv/src

This reverts commit 6b7595c57228e86447dbd638a95bc35b55e67180.

solenv/src/component.map is actually used in
odk/CustomTarget_settings.mk

Change-Id: I01dba8e7e37cc9639ae5ea6f9ee7a7bb8fc6c496

diff --git a/solenv/README b/solenv/README
index 975c8bf..983b4c6 100644
--- a/solenv/README
+++ b/solenv/README
@@ -32,3 +32,8 @@ gdb/
 inc/
old / increasingly obsolete dmake setup and includes, we are
trying to entirely rid ourselves of this
+
+src/
+   useful standard / re-usable component map files for components
+   which shouldn't export anything more than a few registration
+   symbols.
diff --git a/solenv/src/component.map b/solenv/src/component.map
new file mode 100644
index 000..db10831
--- /dev/null
+++ b/solenv/src/component.map
@@ -0,0 +1,23 @@
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This file incorporates work covered by the following license notice:
+#
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements. See the NOTICE file distributed
+#   with this work for additional information regarding copyright
+#   ownership. The ASF licenses this file to you under the Apache
+#   License, Version 2.0 (the License); you may not use this file
+#   except in compliance with the License. You may obtain a copy of
+#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+#
+UDK_3_0_0 {
+global:
+component_getFactory;
+local:
+*;
+};
diff --git a/solenv/src/reg-component.map b/solenv/src/reg-component.map
new file mode 100644
index 000..a071966
--- /dev/null
+++ b/solenv/src/reg-component.map
@@ -0,0 +1,24 @@
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This file incorporates work covered by the following license notice:
+#
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements. See the NOTICE file distributed
+#   with this work for additional information regarding copyright
+#   ownership. The ASF licenses this file to you under the Apache
+#   License, Version 2.0 (the License); you may not use this file
+#   except in compliance with the License. You may obtain a copy of
+#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+#
+UDK_3_0_0 {
+global:
+component_writeInfo;
+component_getFactory;
+local:
+*;
+};
diff --git a/solenv/src/solaris_noexstk.map b/solenv/src/solaris_noexstk.map
new file mode 100644
index 000..27fdb9c
--- /dev/null
+++ b/solenv/src/solaris_noexstk.map
@@ -0,0 +1,21 @@
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This file incorporates work covered by the following license notice:
+#
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements. See the NOTICE file distributed
+#   with this work for additional information regarding copyright
+#   ownership. The ASF licenses this file to you under the Apache
+#   License, Version 2.0 (the License); you may not use this file
+#   except in compliance with the License. You may obtain a copy of
+#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+#
+# mapfile for non-executable stack
+# see @ /usr/lib/ld/map.noexstk
+#
+stack = STACK ?RW;
diff --git a/solenv/src/unloadablecomponent.map 
b/solenv/src/unloadablecomponent.map
new file mode 100644
index 000..5ea17d0
--- /dev/null
+++ b/solenv/src/unloadablecomponent.map
@@ -0,0 +1,24 @@
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This file incorporates work covered by the following license notice:
+#
+#   Licensed to the

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - writerfilter/source

 writerfilter/source/dmapper/NumberingManager.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 0d6df6312d84e1ae2680af78538de94938f94605
Author: Michael Stahl mst...@redhat.com
Date:   Wed Feb 27 23:20:24 2013 +0100

fdo#61000: writerfilter: filter out unsupported list tab stops

Change-Id: Ic9d31eba84b1d8d9cf93d8289621a65d43521a8b
(cherry picked from commit dbb74ee9950dc706ea4fde3397a4c1d19b172fa9)
Reviewed-on: https://gerrit.libreoffice.org/2464
Reviewed-by: Niko RÃ¶nkkÃ¶ ron...@iki.fi
Reviewed-by: Joren De Cuyper joren.libreoff...@telenet.be
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/writerfilter/source/dmapper/NumberingManager.cxx 
b/writerfilter/source/dmapper/NumberingManager.cxx
index 23b7225..529a794 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -135,7 +135,13 @@ void ListLevel::SetValue( Id nId, sal_Int32 nValue )
 m_nXChFollow = nValue;
 break;
 case NS_ooxml::LN_CT_TabStop_pos:
-m_nTabstop = nValue;
+if (nValue  0)
+{
+SAL_INFO(writerfilter,
+unsupported list tab stop position   nValue);
+}
+else
+m_nTabstop = nValue;
 break;
 default:
 OSL_FAIL( this line should never be reached);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-0] fdo#61000: writerfilter: filter out unsupported list tab sto...

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/2464

Approvals:
  Caolán McNamara: Verified; Looks good to me, approved
  Joren De Cuyper: Looks good to me, but someone else must approve
  Niko Rönkkö: Looks good to me, but someone else must approve


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic9d31eba84b1d8d9cf93d8289621a65d43521a8b
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Michael Stahl mst...@redhat.com
Gerrit-Reviewer: Caolán McNamara caol...@redhat.com
Gerrit-Reviewer: Joren De Cuyper joren.libreoff...@telenet.be
Gerrit-Reviewer: Niko Rönkkö ron...@iki.fi

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

[Libreoffice-commits] core.git: accessibility/prj afms/prj animations/prj apache-commons/prj apple_remote/prj autodoc/prj avmedia/prj basctl/prj basebmp/prj basegfx/prj basic/prj bean/prj beanshell/pr

 apple_remote/prj/d.lst |1 -
 autodoc/prj/d.lst  |1 -
 boost/prj/d.lst|1 -
 tomcat/prj/d.lst   |1 -
 4 files changed, 4 deletions(-)

New commits:
commit b768611724a3c25e4267c921308006abe03f97f7
Author: Michael Stahl mst...@redhat.com
Date:   Thu Feb 28 18:39:34 2013 +0100

remove all d.lst

Change-Id: Icba4218c5f9fe89d183d25ea82a8eae52881f885

diff --git a/MathMLDTD/prj/d.lst b/MathMLDTD/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/Mesa/prj/d.lst b/Mesa/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/UnoControls/prj/d.lst b/UnoControls/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/accessibility/prj/d.lst b/accessibility/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/afms/prj/d.lst b/afms/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/animations/prj/d.lst b/animations/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/apache-commons/prj/d.lst b/apache-commons/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/apple_remote/prj/d.lst b/apple_remote/prj/d.lst
deleted file mode 100644
index 8b13789..000
--- a/apple_remote/prj/d.lst
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/autodoc/prj/d.lst b/autodoc/prj/d.lst
deleted file mode 100644
index 8b13789..000
--- a/autodoc/prj/d.lst
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/avmedia/prj/d.lst b/avmedia/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/basctl/prj/d.lst b/basctl/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/basebmp/prj/d.lst b/basebmp/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/basegfx/prj/d.lst b/basegfx/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/basic/prj/d.lst b/basic/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/bean/prj/d.lst b/bean/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/beanshell/prj/d.lst b/beanshell/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/binaryurp/prj/d.lst b/binaryurp/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/bluez_bluetooth/prj/d.lst b/bluez_bluetooth/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/boost/prj/d.lst b/boost/prj/d.lst
deleted file mode 100644
index 8b13789..000
--- a/boost/prj/d.lst
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/bridges/prj/d.lst b/bridges/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/cairo/prj/d.lst b/cairo/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/canvas/prj/d.lst b/canvas/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/chart2/prj/d.lst b/chart2/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/cli_ure/prj/d.lst b/cli_ure/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/clucene/prj/d.lst b/clucene/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/codemaker/prj/d.lst b/codemaker/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/comphelper/prj/d.lst b/comphelper/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/configmgr/prj/d.lst b/configmgr/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/connectivity/prj/d.lst b/connectivity/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/cosv/prj/d.lst b/cosv/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/cppcanvas/prj/d.lst b/cppcanvas/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/cppu/prj/d.lst b/cppu/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/cppuhelper/prj/d.lst b/cppuhelper/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/cppunit/prj/d.lst b/cppunit/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/cpputools/prj/d.lst b/cpputools/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/crashrep/prj/d.lst b/crashrep/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/ct2n/prj/d.lst b/ct2n/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/cui/prj/d.lst b/cui/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/curl/prj/d.lst b/curl/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/dbaccess/prj/d.lst b/dbaccess/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/desktop/prj/d.lst b/desktop/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/drawinglayer/prj/d.lst b/drawinglayer/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/dtrans/prj/d.lst b/dtrans/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git a/editeng/prj/d.lst b/editeng/prj/d.lst
deleted file mode 100644
index e69de29..000
diff --git

[Libreoffice-commits] core.git: helpcontent2

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a44abcf0da93abbc1aaf15fb16fd907d812f2ff9
Author: Michael Stahl mst...@redhat.com
Date:   Thu Feb 28 18:44:08 2013 +0100

Updated core
Project: help  5218df0d55405043e35ffbbc5c2c7be1d259837d

diff --git a/helpcontent2 b/helpcontent2
index dd64dc0..5218df0 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit dd64dc0f137c28c8889c525adf3eb26caab38db5
+Subproject commit 5218df0d55405043e35ffbbc5c2c7be1d259837d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: prj/d.lst

 0 files changed

New commits:
commit 5218df0d55405043e35ffbbc5c2c7be1d259837d
Author: Michael Stahl mst...@redhat.com
Date:   Thu Feb 28 18:44:08 2013 +0100

helpcontent2: remove d.lst

Change-Id: I5cd1e3c8f37c0447178da90b0b23d75dc4b3ffc5

diff --git a/prj/d.lst b/prj/d.lst
deleted file mode 100644
index e69de29..000
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dictionaries

 dictionaries |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c66b914a7f5d2eae694b5f083ea8b5ff8320753c
Author: Michael Stahl mst...@redhat.com
Date:   Thu Feb 28 18:45:11 2013 +0100

Updated core
Project: dictionaries  22c5f0b69b2e2954bddbb0ce0dcfe5721b440bd1

diff --git a/dictionaries b/dictionaries
index 892bb8a..22c5f0b 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 892bb8a4b02d261d9fda2648f595139c06b59913
+Subproject commit 22c5f0b69b2e2954bddbb0ce0dcfe5721b440bd1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: prj/d.lst