[Libreoffice-commits] .: mysqlc/source

[Libreoffice Gerrit user]

 mysqlc/source/makefile.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 20362a86f8ff9cb7f522a5ddf1c01b462026e91d
Author: Stephan Bergmann 
Date:   Wed Nov 21 08:34:03 2012 +0100

"newtrans.1.0" -> "translations"

Change-Id: Ib14f6087bd4123202cf2bffe79c82421a38c1c36

diff --git a/mysqlc/source/makefile.mk b/mysqlc/source/makefile.mk
index 232bc1f..9270770 100644
--- a/mysqlc/source/makefile.mk
+++ b/mysqlc/source/makefile.mk
@@ -236,7 +236,7 @@ $(COMPONENT_DESCRIPTIONS_PACKDEP) : $(DESCRIPTION)
 $(DESCRIPTION_SRC): description.xml
 +-$(RM) $@
 .IF "$(WITH_LANG)" != ""
-$(XRMEX) -p $(PRJNAME) -i $< -o $@ -m $(mktmp 
$(foreach,lang,$(subst,en-US, $(WITH_LANG)) 
$(SRCDIR)$/newtrans.1.0/source/$(lang)/$(PRJNAME)$/$(PATH_IN_MODULE).po)) -l all
+$(XRMEX) -p $(PRJNAME) -i $< -o $@ -m $(mktmp 
$(foreach,lang,$(subst,en-US, $(WITH_LANG)) 
$(SRCDIR)/translations/source/$(lang)/$(PRJNAME)$/$(PATH_IN_MODULE).po)) -l all
 $(SED) "s/#VERSION#/$(EXTENSION_VERSION)/" < $@ > $@.new
 mv $@.new $@
 @$(COPY) $(@:d)/description-*.txt $(EXTENSIONDIR)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: l10ntools/source

[Libreoffice Gerrit user]

 l10ntools/source/renewpo.cxx |   27 ++-
 1 file changed, 18 insertions(+), 9 deletions(-)

New commits:
commit 7f0bf0941c29fd0e1a83b6f4823f5c220f9cf365
Author: Luboš Luňák 
Date:   Wed Nov 21 08:31:50 2012 +0100

dirent.h doesn't exist on windows

Change-Id: Id2afa8a9ef944285a34f51cd685cd0ff5a9b6041

diff --git a/l10ntools/source/renewpo.cxx b/l10ntools/source/renewpo.cxx
index 87a871a..13a7016 100644
--- a/l10ntools/source/renewpo.cxx
+++ b/l10ntools/source/renewpo.cxx
@@ -9,7 +9,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -58,12 +57,10 @@ OString DelLocalId(const OString& rLine)
 }
 
 //Renew po files of the actual language
-void HandleLanguage(struct dirent* pLangEntry, const OString& rOldPath,
+void HandleLanguage(const OString& LangEntryName, const OString& rOldPath,
 const OString& rNewPath, const OString& rpo2loPath,
 const OString& rSDFPath)
 {
-const OString LangEntryName = pLangEntry->d_name;
-
 //Generate and open sdf
 cout << "Process start with language: " <<  LangEntryName.getStr() << endl;
 OUString aTempUrl;
@@ -228,15 +225,27 @@ int main(int argc, char* argv[])
 }
 
 //Call processing function with all language directories
-DIR* pTranslations = opendir(argv[1]);
-while ( struct dirent* pActEntry = readdir(pTranslations) )
+OUString pathUrl;
+if( osl::Directory::getFileURLFromSystemPath(
+OStringToOUString( argv[ 1 ], RTL_TEXTENCODING_UTF8 ), pathUrl ) == 
osl::Directory::E_None )
 {
-if ( OString(pActEntry->d_name).indexOf('.')==-1 )
-HandleLanguage(pActEntry,OString(argv[1]),
+osl::Directory dir( pathUrl );
+if( dir.reset() == osl::Directory::E_None )
+{
+for(;;)
+{
+osl::DirectoryItem item;
+if( dir.getNextItem( item ) != osl::Directory::E_None )
+break;
+osl::FileStatus status( osl_FileStatus_Mask_FileName );
+if( item.getFileStatus( status ) == osl::File::E_None && 
status.getFileName().indexOf('.')==-1 )
+HandleLanguage( OUStringToOString(status.getFileName(), 
RTL_TEXTENCODING_UTF8),
+   OString(argv[1]),
OString(argv[2]),OString(argv[3]),
OString(argv[4]));
+}
+}
 }
-closedir(pTranslations);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED] fdo#42070-Fix RTL support in presenter console

[Stephan Bergmann]

On 11/20/2012 08:27 PM, Andras Timar (via Code Review) wrote:

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

If you are interested in details, please visit

 https://gerrit.libreoffice.org/1053

Approvals:
   Lior Kaplan: Verified
   Andras Timar: Verified; Looks good to me, approved


As discussed on gerrit, this does not work and breaks the Mac OS X 
build.  I'll see to get the break fixed by changing the presenter 
console into a non-extension now.


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

[Libreoffice-commits] .: 2 commits - configure.ac

[Libreoffice Gerrit user]

 configure.ac |6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 7855aef5a5abea4c3c5630da042c868c59c5ace4
Author: Luboš Luňák 
Date:   Wed Nov 21 08:42:18 2012 +0100

we use gtk only for unix gui

Change-Id: Id783d15cd18a101ef137df0bbf59e472d4a0a490

diff --git a/configure.ac b/configure.ac
index 2937e9c..a121719 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9420,7 +9420,7 @@ AC_SUBST(GTK3_CFLAGS)
 AC_SUBST(ENABLE_GTK3)
 
 AC_MSG_CHECKING([which VCLplugs shall be built])
-if test $_os = Darwin -o $_os = iOS -o $_os = Android -o "$enable_headless" = 
"yes"; then
+if test "$GUIBASE" != "unx" -o "$enable_headless" = "yes"; then
 enable_gtk=no
 fi
 ENABLE_GTK=""
commit e8f1df149e88ab494db4d32818ba9420d941208a
Author: Luboš Luňák 
Date:   Wed Nov 21 08:40:57 2012 +0100

cairo will be tested for with guibase unx even without gtk

Change-Id: I0f433e1fc42e3aff955867d8af3e4c1935794b7b

diff --git a/configure.ac b/configure.ac
index 20299e9..2937e9c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9425,10 +9425,6 @@ if test $_os = Darwin -o $_os = iOS -o $_os = Android -o 
"$enable_headless" = "y
 fi
 ENABLE_GTK=""
 if test "x$enable_gtk" = "xyes"; then
-if test "$GUIBASE" = "unx"; then
-# Used in vcl/Library_vclplug_gtk.mk
-test_cairo=yes
-fi
 ENABLE_GTK="TRUE"
 R="gtk $R"
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dictionaries helpcontent2 translations

[Libreoffice Gerrit user]

 dictionaries |2 +-
 helpcontent2 |2 +-
 translations |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4166e79430fdf559fe3db37b6450fa92c2124a06
Author: Stephan Bergmann 
Date:   Wed Nov 21 08:54:37 2012 +0100

Fix submodules

4c543284b5d4076a1478e6a113724f9353341d6a "Added Tango icons" had erroneously
rolled their heads back.

Change-Id: Ic6a31e894a7bd2c880ea2537d3bd1fa7b90001c1

diff --git a/dictionaries b/dictionaries
index 028f440..e295c6f 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 028f44069fd346ba07b3a0263ee340022eb44d6c
+Subproject commit e295c6f831f0435fc5a68ea0fd1a50bcba76ea16
diff --git a/helpcontent2 b/helpcontent2
index 23d7515..66abeb1 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 23d7515757534fca7d50e1201745586adde4b8f6
+Subproject commit 66abeb18556b468ea3d97cea78dcd8e9f0c94380
diff --git a/translations b/translations
index e56b8e6..ae82c7e 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit e56b8e6646a90ecd054fae9d09ea4b0cbc6c66eb
+Subproject commit ae82c7e8c304794a9a534c6dd202b5d94c32e82a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: svtools/source

[Libreoffice Gerrit user]

 svtools/source/filter/wmf/winmtf.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 33e63a1562cbb63b6db36812d159eac2cfa8fcc7
Author: Thorsten Behrens 
Date:   Wed Nov 21 01:12:08 2012 +0100

Fix fdo#57353 correct moveTo handling for emf path recording

A moveTo following an existing path really should create a new
subpath, not add to the existing one. It's the equivalent of lifting
the pen.

Change-Id: I196ca9435f8b4225837add964aec7afceb1d6d88

diff --git a/svtools/source/filter/wmf/winmtf.cxx 
b/svtools/source/filter/wmf/winmtf.cxx
index 2d30b8d..63b0996 100644
--- a/svtools/source/filter/wmf/winmtf.cxx
+++ b/svtools/source/filter/wmf/winmtf.cxx
@@ -1101,7 +1101,13 @@ void WinMtfOutput::MoveTo( const Point& rPoint, sal_Bool 
bRecordPath )
 {
 Point aDest( ImplMap( rPoint ) );
 if ( bRecordPath )
+{
+// fdo#57353 create new subpath for subsequent moves
+if ( aPathObj.Count() )
+if ( aPathObj[ aPathObj.Count() - 1 ].GetSize() )
+aPathObj.Insert( Polygon(), POLYPOLY_APPEND );
 aPathObj.AddPoint( aDest );
+}
 maActPos = aDest;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: scp2/source

[Libreoffice Gerrit user]

 scp2/source/ooo/file_library_ooo.scp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 14785648d5534855a0c7f322aa97a7b58a4cb3a8
Author: Miklos Vajna 
Date:   Wed Nov 21 09:23:03 2012 +0100

scp2: adapt after cairo/pixman gbuildification

Change-Id: I812326e602b5a864cf4e5502ed8a943da801a014

diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index abf10a4..19e7158 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -583,7 +583,7 @@ File gid_File_Lib_Cairo
 #ifdef MACOSX
Name = STRING(CONCAT3(libcairo,.2,UNXSUFFIX));
 #else
-   Name = STRING(CONCAT3(libcairo,UNXSUFFIX,.2));
+   Name = STRING(CONCAT2(libcairo,UNXSUFFIX));
 #endif
   #elif defined(WNT)
 #ifdef _gcc3
@@ -601,7 +601,7 @@ File gid_File_Lib_Pixman
 Styles = (PACKED);
 Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
-   Name = STRING(CONCAT3(libpixman-1,UNXSUFFIX,.0));
+   Name = STRING(CONCAT2(libpixman-1,UNXSUFFIX));
   #endif
 End
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: config_host.mk.in configure.ac icu/makefile.mk ooo.lst.in

[Libreoffice Gerrit user]

 config_host.mk.in |1 +
 configure.ac  |   12 
 icu/makefile.mk   |4 +++-
 ooo.lst.in|1 +
 4 files changed, 17 insertions(+), 1 deletion(-)

New commits:
commit e860c78e2390c8d4e924411ac41e045d2a1c3968
Author: Tor Lillqvist 
Date:   Wed Nov 21 10:39:06 2012 +0200

Use subset of ICU data in a bundled ICU

Change-Id: I71673271ec3e10d16f17f5640cbf6a90a1bfb9f4

diff --git a/config_host.mk.in b/config_host.mk.in
index 727bdc7..6b3abda 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -284,6 +284,7 @@ export 
ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER=@ICU_RECLASSIFIED_CONDITION
 export ICU_RECLASSIFIED_HEBREW_LETTER=@ICU_RECLASSIFIED_HEBREW_LETTER@
 export ICU_RECLASSIFIED_PREPEND_SET_EMPTY=@ICU_RECLASSIFIED_PREPEND_SET_EMPTY@
 export ICU_TARBALL=@ICU_TARBALL@
+export ICU_DATA_SUBSET_ZIP=@ICU_DATA_SUBSET_ZIP@
 export ILIB=@ILIB@
 export INPATH=@INPATH@
 export INPATH_FOR_BUILD=@INPATH_FOR_BUILD@
diff --git a/configure.ac b/configure.ac
index a121719..2f16682 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8501,6 +8501,17 @@ else
 AC_MSG_RESULT([internal])
 SYSTEM_ICU="NO"
 ICU_TARBALL="7c53f83e0327343f4060c0eb83842daf-icu4c-49_1_1-src.tgz"
+
+# Save space when using a bundled ICU by leaving out unneeded parts of the 
ICU data. Generated by
+# the interactive web tool at 
http://apps.icu-project.org/datacustom/ICUData49.html by dropping
+# the "Charset Mapping Tables". Probably we could carefully cherry-pick 
other items in the data to
+# be dropped, too. A bit tedious using that web tool, though.
+
+# If you do that, upload a new subset data zip file with just the MD5 part 
of the name changed
+# appropriately. Let's not bother trying to list what stuff has been 
removed in the file name.
+# Describe it in the comment above instead.
+ICU_DATA_SUBSET_ZIP=fc188d2ed5c2cbcf7a021b34b9f88478-icudt49l-subset.zip
+
 BUILD_TYPE="$BUILD_TYPE ICU"
 fi
 
@@ -8516,6 +8527,7 @@ AC_SUBST([ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER])
 AC_SUBST([ICU_RECLASSIFIED_HEBREW_LETTER])
 AC_SUBST(ICU_RECLASSIFIED_PREPEND_SET_EMPTY)
 AC_SUBST(ICU_TARBALL)
+AC_SUBST(ICU_DATA_SUBSET_ZIP)
 AC_SUBST([MINGW_ICUDATA_DLL])
 AC_SUBST([MINGW_ICUI18N_DLL])
 AC_SUBST([MINGW_ICUUC_DLL])
diff --git a/icu/makefile.mk b/icu/makefile.mk
index 01695cc..5066ef0 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -77,6 +77,8 @@ EXTRA_CDEFS+=-DU_HAVE_GCC_ATOMICS=1
 EXTRA_CDEFS+=-DU_HAVE_GCC_ATOMICS=0
 .ENDIF
 
+CONFIGURE_ACTION=unzip $(TARFILE_LOCATION)/$(ICU_DATA_SUBSET_ZIP) && mv 
icudt49l.dat data/in && 
+
 .IF "$(GUI)"=="UNX"
 
 .IF "$(SYSBASE)"!=""
@@ -276,7 +278,7 @@ OUT2BIN= \
 
 .ELSE
 BUILD_DIR=source
-CONFIGURE_ACTION=bash ./runConfigureICU Cygwin/MSVC
+CONFIGURE_ACTION+=bash ./runConfigureICU Cygwin/MSVC
 BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
 
 OUT2LIB= \
diff --git a/ooo.lst.in b/ooo.lst.in
index 5757b7b..4f7596c 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -38,6 +38,7 @@ c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz
 @HUNSPELL_TARBALL@
 @HYPHEN_TARBALL@
 @ICU_TARBALL@
+@ICU_DATA_SUBSET_ZIP@
 @JFREEREPORT_FLOW_ENGINE_TARBALL@
 @JFREEREPORT_FLUTE_TARBALL@
 @JFREEREPORT_LIBBASE_TARBALL@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED] fdo#42070-Fix RTL support in presenter console

[Miklos Vajna]

On Wed, Nov 21, 2012 at 08:43:07AM +0100, Stephan Bergmann 
 wrote:
> As discussed on gerrit, this does not work and breaks the Mac OS X
> build.  I'll see to get the break fixed by changing the presenter
> console into a non-extension now.

Something realted: doing a git diff on the dev-install result between
yesterday and today morning, I get:

rename 
opt/share/extensions/presenter-screen/help/en-US/caption/{com.sun.PresenterScreen-linux_x86_64%2Fpresenter.xhp
 => com.sun.PresenterScreen-PLATFORMID%2Fpresenter.xhp} (100%)

I tried to search for the relevent commit that might have caused this,
but I haven't really seen anything relevant, so I guess it's the
feature/killsdf merge.

Andras, if you could have a look at this, that would be nice. ;-)

Thanks,

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

[Libreoffice-commits] .: extensions/Library_abp.mk extensions/source

[Libreoffice Gerrit user]

 extensions/Library_abp.mk   |2 +
 extensions/source/abpilot/typeselectionpage.cxx |   46 
 2 files changed, 41 insertions(+), 7 deletions(-)

New commits:
commit 0b21dd2593fae41ee430717d7d65e2cfca25b8e9
Author: Stephan Bergmann 
Date:   Wed Nov 21 09:57:36 2012 +0100

Fix datasource choices offered by the Address Book wizard

...as at least on Linux, availability of Mozilla/Thunderbird is independend 
of
WITH_MOZILLA/--enable-mozilla now.  This fix might not be perfect yet, see 
the
TODO comment in the code.

Change-Id: Ie5343a23187648f5e56d82753b6c222e6da7ec54

diff --git a/extensions/Library_abp.mk b/extensions/Library_abp.mk
index b4a5569..49195c0 100644
--- a/extensions/Library_abp.mk
+++ b/extensions/Library_abp.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Library_set_include,abp,\
-I$(SRCDIR)/extensions/source/inc \
 ))
 
+ifeq ($(OS),WNT)
 ifneq ($(WITH_MOZILLA),NO)
 ifneq ($(SYSTEM_MOZILLA),YES)
 $(eval $(call gb_Library_add_defs,abp,\
@@ -45,6 +46,7 @@ $(eval $(call gb_Library_add_defs,abp,\
 ))
 endif
 endif
+endif
 
 $(eval $(call gb_Library_add_defs,abp,\
-DCOMPMOD_NAMESPACE=abp \
diff --git a/extensions/source/abpilot/typeselectionpage.cxx 
b/extensions/source/abpilot/typeselectionpage.cxx
index 655fd0d..6ce6280 100644
--- a/extensions/source/abpilot/typeselectionpage.cxx
+++ b/extensions/source/abpilot/typeselectionpage.cxx
@@ -57,16 +57,47 @@ namespace abp
 Size  aItemSize( LogicToPixel( Size( 0, 8 ), MAP_APPFONT ) );
 aItemSize.Width() = GetOutputSizePixel().Width() - 30;
 
-bool bWithMozilla = true, bUnx = true;
+//TODO:  For now, try to keep offering the same choices like before the
+// Mozilla/MORK cleanup, even if the status of what driver actually
+// provides which functionality is somewhat unclear, see the 
discussions
+// of fdo#57285 "Address Book Data Source Wizard lists 'Mac OS X 
address
+// book' on Linux" and fdo#57322 "Moz-free LDAP Address Book driver."
+// In accordance with ancient OOo 3.3, this is as follows:
+//
+// On Linux:
+// - EVOLUTION, EVOLUTION_GROUPWISE, EVOLUTION_LDAP (if applicable)
+// - MORK (via mork driver, which is built unconditionally)
+// - THUNDERBIRD (via mork driver?, which is built unconditionally)
+// - KAB (if applicable)
+// - LDAP (via mork driver?, which is built unconditionally)
+// - OTHER
+//
+// On Mac OS X:
+// - MACAB (if applicable)
+// - OTHER
+//
+// On Windows:
+// - MORK, THUNDERBIRD, LDAP, OUTLOOK, OUTLOOKEXPRESS (via mozab 
driver,
+//   if WITH_MOZILLA)
+// - OTHER
+
+bool bWithMozilla = false, bWindows = false;
 bool bHaveEvolution = false, bHaveKab = false;
 bool bHaveMacab = false;
 
-#if !defined WITH_MOZILLA || defined MACOSX
-bWithMozilla = false;
+#if defined WNT
+
+#if defined WITH_MOZILLA
+bWithMozilla = true;
 #endif
-#ifndef UNX
-bUnx = false;
+bWindows = true;
+
 #else
+
+#if !defined MACOSX
+bWithMozilla = true;
+#endif
+
 Reference< XDriverAccess> 
xManager(_pParent->getORB()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.DriverManager"))),
 UNO_QUERY);
 
 try
@@ -101,6 +132,7 @@ namespace abp
 catch(...)
 {
 }
+
 #endif
 
 // Items are displayed in list order
@@ -112,8 +144,8 @@ namespace abp
 m_aAllTypes.push_back( ButtonItem( &m_aKab, AST_KAB, bHaveKab ) );
 m_aAllTypes.push_back( ButtonItem( &m_aMacab, AST_MACAB, bHaveMacab ) 
);
 m_aAllTypes.push_back( ButtonItem( &m_aLDAP, AST_LDAP, bWithMozilla ) 
);
-m_aAllTypes.push_back( ButtonItem( &m_aOutlook, AST_OUTLOOK, 
bWithMozilla && !bUnx ) );
-m_aAllTypes.push_back( ButtonItem( &m_aOE, AST_OE, bWithMozilla && 
!bUnx ) );
+m_aAllTypes.push_back( ButtonItem( &m_aOutlook, AST_OUTLOOK, 
bWithMozilla && bWindows ) );
+m_aAllTypes.push_back( ButtonItem( &m_aOE, AST_OE, bWithMozilla && 
bWindows ) );
 m_aAllTypes.push_back( ButtonItem( &m_aOther, AST_OTHER, true ) );
 
 Link aTypeSelectionHandler = LINK(this, TypeSelectionPage, 
OnTypeSelected );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Funding Wishlist

[Rob Snelders]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Hi All,

As far as I think LibreOffice has a big shortage on Marketing, I don't
want to disrespect the marketing-team of LibreOffice, but I think
there are to few people doing marketing, and the tools they have are
limited.

I think we can make a huge jump forward with a Website that people can
update without HTML-skills and easily from a web-based back-end. I
don't know how to do that, as there are also people there needed.

- --
Greetings,
Rob Snelders

Op 13-10-12 22:45, marc.p...@libreoffice.org schreef:
> Hi everyone,
> 
> In trying to better assess the TDF/LibreOffice funding
> requirements, we are compiling a wishlist of funding request
> particular to your team's needs. While there is no guarantee that
> this will get you funding for any particular item, it will help to
> better assess and prioritize the project's needs.
> 
> I have volunteered to take care of setting up, as well as,
> document (facilitate) the proposal from Florian (below)[1]
> 
> snip ==
> 
> "What we effectively need now is a (senseful) wishlist from the
> various teams. Think of it as a Christmas wishlist: You write a
> dozen things on it, eventually you get two or three, which is
> fantastic!
> 
> Besides the infrastructure and cost for ongoing operations, I can
> also imagine some developer machines are required, more travel
> funding, a marketing campaign, funds to produce collaterals and
> swags for giving them away, and many more.
> 
> My proposal is to create a wiki page, asking the various groups to
> write down their wishes, and eventually "distill" a wishlist out of
> that.
> 
> Does that sound senseful? Are there any volunteers for mailing the 
> various lists and compiling an initial wiki page? " (Florian
> Effenberger)
> 
> ==
> 
> I think the key words in Florian's proposal are
> "senseful-whishlist". If there are multiple items, you may want to
> prioritize them in the right order.
> 
> I have set up a wiki page to collect your team's list[2]. Feel free
> to add these to the wiki page after discussing it with your team,
> or, I can also help out with collecting your suggestions by
> re-visiting this thread and then add them to the wiki page.
> 
> Cheers,
> 
> Marc
> 
> [1] 
> http://permalink.gmane.org/gmane.comp.documentation.libreoffice.marketing/6143
>
>  [2]
> http://wiki.documentfoundation.org/Marketing/Funding_Priorities
> 
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with undefined - http://www.enigmail.net/

iQEcBAEBAgAGBQJQq44HAAoJEGs78UIq7mKymVwH/23Nlq4JETrjcYQU6fm3NdNw
8ylehoWJiSRwRwFNy308KlwbJUL8VOJK8QmkPOqHKq+JOAq/LJQaLm5GFG8+IorA
sOsok01mnvX2he9cUhFghPP0Uqi2YoWoGZZaqaFcPXu0UP9ssk9IYzeqNtHQvGFc
qKjU8alR4c3GEzEZlMzl5TWHM07y925D8JU1wprucJz0S41pP5Eg3LyA0mImt2Vh
Yjp5BD+PkHfkQUBv5m6OK+XQJmaVTAPO4TcoGogwBDRxwB7QgzYoO5/CjBXqjkPw
578Jiv2JRRSXG+dQMIpCKS9lAER6rnCYyx2XeLsqTXRpnzZDiJcCFGzJD8iigV4=
=DIaO
-END PGP SIGNATURE-
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED] fdo#42070-Fix RTL support in presenter console

[Andras Timar]

On Wed, Nov 21, 2012 at 9:42 AM, Miklos Vajna  wrote:
> On Wed, Nov 21, 2012 at 08:43:07AM +0100, Stephan Bergmann 
>  wrote:
>> As discussed on gerrit, this does not work and breaks the Mac OS X
>> build.  I'll see to get the break fixed by changing the presenter
>> console into a non-extension now.
>
> Something realted: doing a git diff on the dev-install result between
> yesterday and today morning, I get:
>
> rename 
> opt/share/extensions/presenter-screen/help/en-US/caption/{com.sun.PresenterScreen-linux_x86_64%2Fpresenter.xhp
>  => com.sun.PresenterScreen-PLATFORMID%2Fpresenter.xhp} (100%)
>
> I tried to search for the relevent commit that might have caused this,
> but I haven't really seen anything relevant, so I guess it's the
> feature/killsdf merge.
>
> Andras, if you could have a look at this, that would be nice. ;-)
>

Yes, we found this minor glitch with Tamas in the week-end. I'll fix
it soon. Thanks for testing. :)

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

Re: LO as an NPAPI browser plugin host?

[Stephan Bergmann]

On 11/16/2012 06:01 PM, Stephan Bergmann wrote:

On 11/16/2012 04:50 PM, Regina Henschel wrote:

Stephan Bergmann schrieb:

There is a little-known(?) feature in LO that allows to plug browser
plugins based on the NPAPI standard to display (multimedia) content
inside LO documents.  In Writer at least, it is available via "Insert -
Object - Plug-in...".

The implementation is in extensions/source/plugin/ (which has
platform-specific branches for aqua, unx, and win) and np_sdk/.  And it
appears to be horribly broken, see below for details.


It works fine here for Flash. I use LO3.6 on WinXP. I can insert a flash
file via Insert-Object-Plug-in into a presentation. It works in edit
mode and in presentation mode. So it is not "horrible" broken.


The situation on Windows might be different indeed, given how the
implementations of LO's plugin host interface, but likely also the
plugins themselves, differ across platforms.  Thanks for sharing.


Looks like at least on Mac OS X and Windows, pluging .swf files (which 
is arguably the most -- if not the only -- relevant use-case) via the 
Adobe flash player plugin indeed still works fine.


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

[Libreoffice-commits] .: solenv/gbuild

[Libreoffice Gerrit user]

 solenv/gbuild/gbuild.help.txt |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 4f4870ef032aa45242761205d31dc7ccd4f99fad
Author: Thorsten Behrens 
Date:   Wed Nov 21 10:19:23 2012 +0100

Improve gbuild help text with PARALLELISM env var.

Change-Id: I30c9700127d04aee200386c94307a45da41b0025

diff --git a/solenv/gbuild/gbuild.help.txt b/solenv/gbuild/gbuild.help.txt
index e2c427d..0b1e9ca 100644
--- a/solenv/gbuild/gbuild.help.txt
+++ b/solenv/gbuild/gbuild.help.txt
@@ -69,6 +69,9 @@ INTERACTIVE VARIABLES:
If not empty enable the RTL_LOGFILE_* time logging 
facility.
export RTL_LOGFILE=rtl_logfile.nopid when running 
office, to
get timestamps written out.
+   PARALLELISM If not empty, pass argument on as the -j switch
+   to recursive make invocations. Useful to
+   lower/increase build parallelism individually.
LEXFLAGSAdd as flags for LEX scanner generator invocation.
YACCFLAGS   Add as flags for YACC parser generator invocation.
CPPFLAGSAdd as preprocessor flags for C/C++/ObjC/ObjC++ 
compilation.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: fdo#51004: some progress and 10 years old bug pending

[Stephan Bergmann]

On 11/14/2012 08:59 AM, Stephan Bergmann wrote:

On 11/09/2012 11:50 AM, d.ostrov...@idaia.de wrote:

Quoting Stephan Bergmann :

On 11/09/2012 08:48 AM, David Ostrovsky wrote:

* deprecate moz shipping as it may be needed for some extensions. That
why Stephan reverted my patch:
"don't compile moz module on all non windows platforms"


Which commit are you talking about here?


this one: 903065dda1e574f4791ff40c31e39f14ba710424
which you have partially reverted (removing that section):
+dnl --enable-mozilla is supported only on Windows
+dnl ===
+
+if test "$_os" != "WINNT" ; then
+ if test "$enable_mozilla" = "yes"; then
+ AC_MSG_ERROR([--enable-mozilla is only available on Windows])
+ fi
+
+fi

My concern about it was (and still is), that someone in the wild still
compiles moz on non windows platform without actually using it in any
way.


Looking into the configure mess, the underlying problem appears to be
that --enable-mozilla does not only control whether to build module moz
(BUILD_MOZAB, PREBUILD_MOZAB) and what depends on it, but also
(WITH_MOZILLA) whether to build things that are related to Mozilla (like
the npsoplugin, ) but do
not depend on module moz.

That needs clean-up.


So some clean-up happened now:

* The feature to plug browser plugins into LO documents ("Insert - 
Object - Plug-in...") is actually independent of --enable-mozilla/module 
moz, and is now controlled by ENABLE_NPAPI_FROM_BROWSER.


* The feature to display LO documents in browser windows is actually 
independent of --enable-mozilla/module moz, and is now controlled by 
ENABLE_NPAPI_INTO_BROWSER (was formerly controlled by --enable-nsplugin).


* The list of available data sources in the address book wizard ("File - 
Wizards - Address Data Source...") is now independent of 
--enable-mozilla/module moz on all platforms but Windows, see 
 
"Fix datasource choices offered by the Address Book wizard."


For non-Windows platforms, this leaves no features that are keyed to 
--enable-mozilla, so that switch is no longer relevant there.


Further clean-up of all the Mozilla-related configure switches 
(--enable-mozilla, --disable-build-mozilla, --with-mozilla-toolkit, 
--with-system-mozilla, --with-mozilla-build) and config_host.mk.in 
variables (BUILD_MOZAB, DEFAULT_MOZILLA_TOOLKIT, MOZILLABUILD, 
MOZILLA_VRESION, MOZ_FLAVOUR, MOZ_INC, MOZ_LIB, MOZ_LIB_XPCOM, 
PREBUILD_MOZAB, SYSTEM_MOZILLA, WITH_MOZILLA), which should all now be 
relevant for Windows only, is highly appreciated.


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

[Bug 37361] LibreOffice 3.5 most annoying bugs

[bugzilla-daemon]

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

Rainer Bielefeld  changed:

   What|Removed |Added

 Depends on|45085   |

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

[Libreoffice-commits] .: configure.ac libvisio/libvisio-0.0.20-zlib.patch libvisio/UnpackedTarball_visio.mk

[Libreoffice Gerrit user]

 configure.ac|2 +-
 libvisio/UnpackedTarball_visio.mk   |6 --
 libvisio/libvisio-0.0.20-zlib.patch |   26 --
 3 files changed, 1 insertion(+), 33 deletions(-)

New commits:
commit d34ce24fb22566ed3db91aba71a003d5919a3f00
Author: Fridrich Å trba 
Date:   Wed Nov 21 10:55:35 2012 +0100

Uploading libvisio 0.0.21 release

We can now open ALL Visio file-formats that ever existed

Change-Id: Icfe91421c8ddbba206e2cc0ce59bf718883e5477

diff --git a/configure.ac b/configure.ac
index 2f16682..4fb7e73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6960,7 +6960,7 @@ elif test $_os = iOS; then
 else
 AC_MSG_RESULT([internal])
 SYSTEM_LIBVISIO=NO
-VISIO_TARBALL=2d8c3b50f77c544f317ab0a8838fadcb-libvisio-0.0.20.tar.bz2
+VISIO_TARBALL=1e961f0112e5986105749640c2b9bc41-libvisio-0.0.21.tar.bz2
 fi
 AC_SUBST(SYSTEM_LIBVISIO)
 AC_SUBST(VISIO_CFLAGS)
diff --git a/libvisio/UnpackedTarball_visio.mk 
b/libvisio/UnpackedTarball_visio.mk
index 59d4adb..aa9113b 100644
--- a/libvisio/UnpackedTarball_visio.mk
+++ b/libvisio/UnpackedTarball_visio.mk
@@ -11,10 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,visio))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,visio,$(VISIO_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_set_patchlevel,visio,1))
-
-$(eval $(call gb_UnpackedTarball_add_patches,visio,\
-   libvisio/libvisio-0.0.20-zlib.patch \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/libvisio/libvisio-0.0.20-zlib.patch 
b/libvisio/libvisio-0.0.20-zlib.patch
deleted file mode 100644
index 28cf881..000
--- a/libvisio/libvisio-0.0.20-zlib.patch
+++ /dev/null
@@ -1,26 +0,0 @@
 libvisio-0.0.20/configure
-+++ libvisio-0.0.20/configure
-@@ -17165,8 +17165,8 @@
- fi
- 
- fi
--LIBVISIO_CXXFLAGS="${WPD_CFLAGS} ${WPG_CFLAGS} ${LIBXML_CFLAGS}"
--LIBVISIO_LIBS="${WPD_LIBS} ${WPG_LIBS} ${LIBXML_LIBS}"
-+LIBVISIO_CXXFLAGS="${WPD_CFLAGS} ${WPG_CFLAGS} ${LIBXML_CFLAGS} 
${ZLIB_CFLAGS}"
-+LIBVISIO_LIBS="${WPD_LIBS} ${WPG_LIBS} ${LIBXML_LIBS} ${ZLIB_LIBS}"
- 
- 
- 
 libvisio-0.0.20/Makefile.in
-+++ libvisio-0.0.20/Makefile.in
-@@ -55,8 +55,8 @@
-   $(srcdir)/Makefile.in $(srcdir)/config.h.in \
-   $(srcdir)/libvisio-0.0.pc.in $(srcdir)/libvisio-zip.in \
-   $(srcdir)/libvisio.spec.in $(top_srcdir)/configure AUTHORS \
--  NEWS ar-lib config.guess config.sub install-sh ltmain.sh \
--  missing
-+  NEWS ar-lib config.guess config.sub depcomp install-sh \
-+  ltmain.sh missing
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: src/docdirstream.py src/docrecord.py

[Miklos Vajna]

 src/docdirstream.py |7 +++
 src/docrecord.py|   25 +
 2 files changed, 32 insertions(+)

New commits:
commit 915193c77b2c897be5b8ffbdb500131a1f2f0df2
Author: Miklos Vajna 
Date:   Wed Nov 21 10:40:47 2012 +0100

finish dumping ATRDPre10

diff --git a/src/docdirstream.py b/src/docdirstream.py
index cbb7d21..c488904 100755
--- a/src/docdirstream.py
+++ b/src/docdirstream.py
@@ -52,6 +52,13 @@ class DOCDirStream:
 pos = self.pos
 return struct.unpack("' % self.name
 
+class LPXCharBuffer9(DOCDirStream):
+"""The LPXCharBuffer9 structure is a length-prefixed buffer for up to 9 
Unicode characters."""
+def __init__(self, parent, name):
+DOCDirStream.__init__(self, parent.bytes)
+self.pos = parent.pos
+self.name = name
+
+def dump(self):
+print '<%s type="LPXCharBuffer9" offset="%d" size="20 bytes">' % 
(self.name, self.pos)
+self.printAndSet("cch", self.getuInt16())
+self.pos += 2
+self.printAndSet("xcharArray", 
self.bytes[self.pos:self.pos+(self.cch*2)].decode('utf-16'), hexdump = False)
+print '' % self.name
+
 class ATRDPre10(DOCDirStream):
 """The ATRDPre10 structure contains information about a comment in the 
document."""
 def __init__(self, aPlcfandRef, offset):
@@ -326,6 +340,17 @@ class ATRDPre10(DOCDirStream):
 
 def dump(self):
 print '' % 
self.pos
+xstUsrInitl = LPXCharBuffer9(self, "xstUsrInitl")
+xstUsrInitl.dump()
+self.pos += 20
+self.printAndSet("ibst", self.getuInt16())
+self.pos += 2
+self.printAndSet("bitsNotUsed", self.getuInt16())
+self.pos += 2
+self.printAndSet("grfNotUsed", self.getuInt16())
+self.pos += 2
+self.printAndSet("ITagBkmk", self.getInt32())
+self.pos += 4
 print ''
 
 class PnFkpPapx(DOCDirStream):
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.ac scp2/source

[Libreoffice Gerrit user]

 configure.ac |5 +++--
 scp2/source/ooo/file_library_ooo.scp |8 +---
 2 files changed, 4 insertions(+), 9 deletions(-)

New commits:
commit e22be4a8e4da40dd6609147513aea36bc8f5cfb9
Author: Matúš Kukan 
Date:   Wed Nov 21 11:08:21 2012 +0100

scp2: more cairo fixes

Change-Id: Icaaf0c8355d992fcf652c275ea1ebff98f6d3d58

diff --git a/configure.ac b/configure.ac
index 4fb7e73..347f43b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11358,8 +11358,6 @@ else
 fi
 AC_SUBST(ENABLE_SILENT_MSI)
 
-AC_SUBST(SCPDEFS)
-
 AC_MSG_CHECKING([whether and how to use Xinerama])
 if test "$_os" = "Darwin"; then
 USE_XINERAMA=YES
@@ -11473,6 +11471,7 @@ if test "$test_cairo" = "yes" ; then
 CAIRO_TARBALL="f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz"
 PIXMAN_TARBALL="c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2"
 BUILD_TYPE="$BUILD_TYPE CAIRO"
+SCPDEFS="$SCPDEFS -DNEED_CAIRO"
 fi
 fi
 
@@ -11825,6 +11824,8 @@ else
 fi
 AC_SUBST([DOXYGEN])
 
+AC_SUBST(SCPDEFS)
+
 dnl ===
 dnl Product version
 dnl ===
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index 19e7158..9df93a8 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -569,11 +569,7 @@ End
 
 #endif
 
-#ifndef LIBO_HEADLESS
-
-#if !defined SYSTEM_CAIRO \
-&& (defined ENABLE_CAIRO_CANVAS \
-|| (defined WNT && !defined ENABLE_DIRECTX))
+#ifdef NEED_CAIRO
 
 File gid_File_Lib_Cairo
 LIB_FILE_BODY;
@@ -609,8 +605,6 @@ End
 
 #endif
 
-#endif
-
 STD_LIB_FILE( gid_File_Lib_Frm , frm)
 
 SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fsstorage, fsstorage.uno )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

issues building against mac 10.7 sdk

[Jonathan Aquilina]

I am aware that anything above 10.4 is experimental and can cause issues,
but something that doesnt make sense for me is that Alexander Thurgood is
able to build against the 10.8 sdk. I am not understanding for me why on
earth my build fails in cppunit. Does this mean there is a failing unit
test somewhere?

My autogen switches are as follows

--with-macosx-sdk=10.7
--without-doxygen
--enable-debug
--enable-dgbutils
--enable-symbols
--with-system-openssl
--disable-build-mozilla

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

[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - sc/inc sc/source

[Libreoffice Gerrit user]

 sc/inc/conditio.hxx|6 ++
 sc/source/core/data/conditio.cxx   |   20 
 sc/source/filter/xml/xmlcondformat.cxx |7 +++
 3 files changed, 29 insertions(+), 4 deletions(-)

New commits:
commit 4d65f5fae0cbdb551c6bffc13bfab60a1301756e
Author: Markus Mohrhard 
Date:   Mon Nov 12 07:16:05 2012 +0100

remove conditional formats withiout range after import, related fdo#56983

(cherry picked from commit eb240530443b964ea45bf80a5e3711e11a3f09c5)

Change-Id: I9a8c02369c3e5a12310a46229bdc1671f75593ad

diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index 80a8e62..c94f145 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -336,6 +336,12 @@ public:
 
 voidInsertNew( ScConditionalFormat* pNew )
 { maConditionalFormats.insert(pNew); }
+/**
+ * Checks that all cond formats have a non empty range.
+ * Deletes empty cond formats.
+ * @return true if all cond formats were valid
+ */
+boolCheckAllEntries();
 
 ScConditionalFormat* GetFormat( sal_uInt32 nKey );
 
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 994a199..d0c40e9 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -1713,20 +1713,32 @@ void ScConditionalFormatList::UpdateMoveTab( SCTAB 
nOldPos, SCTAB nNewPos )
 itr->UpdateMoveTab( nOldPos, nNewPos );
 }
 
-void ScConditionalFormatList::DeleteArea( SCCOL nCol1, SCROW nRow1, SCCOL 
nCol2, SCROW nRow2 )
+bool ScConditionalFormatList::CheckAllEntries()
 {
-for( iterator itr = begin(); itr != end(); ++itr)
-itr->DeleteArea( nCol1, nRow1, nCol2, nRow2 );
-
+bool bValid = true;
+//
 // need to check which must be deleted
 iterator itr = begin();
 while(itr != end())
 {
 if(itr->GetRange().empty())
+{
+bValid = false;
 maConditionalFormats.erase(itr++);
+}
 else
 ++itr;
 }
+
+return bValid;
+}
+
+void ScConditionalFormatList::DeleteArea( SCCOL nCol1, SCROW nRow1, SCCOL 
nCol2, SCROW nRow2 )
+{
+for( iterator itr = begin(); itr != end(); ++itr)
+itr->DeleteArea( nCol1, nRow1, nCol2, nRow2 );
+
+CheckAllEntries();
 }
 
 void ScConditionalFormatList::SourceChanged( const ScAddress& rAddr )
diff --git a/sc/source/filter/xml/xmlcondformat.cxx 
b/sc/source/filter/xml/xmlcondformat.cxx
index a8a47f1..dbb5028 100644
--- a/sc/source/filter/xml/xmlcondformat.cxx
+++ b/sc/source/filter/xml/xmlcondformat.cxx
@@ -72,6 +72,13 @@ SvXMLImportContext* 
ScXMLConditionalFormatsContext::CreateChildContext( sal_uInt
 
 void ScXMLConditionalFormatsContext::EndElement()
 {
+ScDocument* pDoc = GetScImport().GetDocument();
+
+SCTAB nTab = GetScImport().GetTables().GetCurrentSheet();
+ScConditionalFormatList* pCondFormatList = pDoc->GetCondFormList(nTab);
+bool bDeleted = !pCondFormatList->CheckAllEntries();
+
+SAL_WARN_IF(bDeleted, "sc", "conditional formats have been deleted because 
they contained empty range info");
 }
 
 ScXMLConditionalFormatContext::ScXMLConditionalFormatContext( ScXMLImport& 
rImport, sal_uInt16 nPrfx,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[REVIEW 3-6] fdo#56548, also remove comment caption objects when deleting comments

[Markus Mohrhard]

Hey,

[1] fixes that comment captions are not deleted with the comment. I
checked that undo/redo are memcheck clean as the note caption object
lifetime is not simple.

Regards,
Markus

[1] 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=f44928cbd51fc7d08e2b81dcdf837650cd215847
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Funding Wishlist

[Thorsten Behrens]

Marc Paré wrote:
> We are seriously looking at different teams' wishlists. Please do
> take a little time out of your busy schedule and speak to your teams
> about any funding for items that you think may be of importance to
> your team or the enhance the functioning of your team's work on the
> project.
>
Hi Marc,

thanks a lot for running this - and yes, I think the dev team would
benefit from some more tinderboxes. Unless there's other support
coming up, I'd like to suggest buying another Mac box for
gerrit/tinderboxing. I have an offer for a used Mac Mini as follows:

Mac Mini, last year's version, 2,7 GHz DualCore i7, 4 GB RAM, AMD
Radeon HD 6630M, OS X Lion, Samsung SSD 128 GB 470 Series MLC, HDMI,
DVI.

(like http://support.apple.com/kb/SP632 but with bigger cpu & ssd)

Quote has it for € 700.

Cheers,

-- Thorsten


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

[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - sc/source

[Libreoffice Gerrit user]

 sc/source/core/data/dpcache.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5404bf540296d3a24d13b705d0dc2233e8070036
Author: Kohei Yoshida 
Date:   Thu Nov 8 16:09:11 2012 -0500

fdo#54898: Test equality by order index (integer) which is more stable.

At the point where std::unique is called, we can use order indices to
determine whether the two items are equal. This should be more stable
than using CaseInsEqual() to assess equality.

Change-Id: I88310fc7beede19fb1c629b9b7e3cb9a069b2b23
Reviewed-on: https://gerrit.libreoffice.org/1013
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index c754fba..1fbddfc 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -279,11 +279,11 @@ struct LessByDataIndex : std::binary_function
 }
 };
 
-struct EqualByValue : std::binary_function
+struct EqualByOrderIndex : std::binary_function
 {
 bool operator() (const Bucket& left, const Bucket& right) const
 {
-return left.maValue.IsCaseInsEqual(right.maValue);
+return left.mnOrderIndex == right.mnOrderIndex;
 }
 };
 
@@ -359,7 +359,7 @@ void processBuckets(std::vector& aBuckets, 
ScDPCache::Field& rField)
 
 // Unique by value.
 std::vector::iterator itUniqueEnd =
-std::unique(aBuckets.begin(), aBuckets.end(), EqualByValue());
+std::unique(aBuckets.begin(), aBuckets.end(), EqualByOrderIndex());
 
 // Copy the unique values into items.
 std::vector::iterator itBeg = aBuckets.begin();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit 9ac1f0aae7d1e288518e024683fade15f2713528
Author: Caolán McNamara 
Date:   Wed Nov 21 10:56:21 2012 +

Updated core
Project: help  bfe8b1eea5e372ff7198d841caa20c72a57610e0
update xml filter settings dialog helpids to .ui

diff --git a/helpcontent2 b/helpcontent2
index 66abeb1..bfe8b1e 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 66abeb18556b468ea3d97cea78dcd8e9f0c94380
+Subproject commit bfe8b1eea5e372ff7198d841caa20c72a57610e0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: helpers/help_hid.lst source/text

[Libreoffice Gerrit user]

 helpers/help_hid.lst   |9 
 source/text/shared/01/0615.xhp |   38 ++---
 2 files changed, 19 insertions(+), 28 deletions(-)

New commits:
commit bfe8b1eea5e372ff7198d841caa20c72a57610e0
Author: Caolán McNamara 
Date:   Wed Nov 21 10:56:21 2012 +

update xml filter settings dialog helpids to .ui

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 7b592f2..6808909 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -4125,13 +4125,10 @@ HID_XMLSEC_TP_MACROSEC,43068,
 HID_XMLSEC_TP_SECLEVEL,43069,
 HID_XMLSEC_TP_TRUSTSOURCES,43070,
 HID_XML_FILTER_APPLICATION,64064,
-HID_XML_FILTER_CLOSE,64059,
-HID_XML_FILTER_DELETE,64056,
 HID_XML_FILTER_DESCRIPTION,64067,
 HID_XML_FILTER_DOCTYPE,64068,
 HID_XML_FILTER_DTD,64069,
 HID_XML_FILTER_DTD_BROWSE,64070,
-HID_XML_FILTER_EDIT,64054,
 HID_XML_FILTER_EXPORT_XSLT,64071,
 HID_XML_FILTER_EXPORT_XSLT_BROWSE,64072,
 HID_XML_FILTER_EXTENSION,64066,
@@ -4140,18 +4137,12 @@ HID_XML_FILTER_IMPORT_TEMPLATE_BROWSE,64087,
 HID_XML_FILTER_IMPORT_XSLT,64073,
 HID_XML_FILTER_IMPORT_XSLT_BROWSE,64074,
 HID_XML_FILTER_INTERFACE_NAME,64065,
-HID_XML_FILTER_LIST,64052,
 HID_XML_FILTER_NAME,64063,
-HID_XML_FILTER_NEW,64053,
-HID_XML_FILTER_OPEN,64058,
 HID_XML_FILTER_OUTPUT_WINDOW,64089,
-HID_XML_FILTER_SAVE,64057,
-HID_XML_FILTER_SETTINGS_DIALOG,64051,
 HID_XML_FILTER_TABDIALOG,64060,
 HID_XML_FILTER_TABPAGE_BASIC,64061,
 HID_XML_FILTER_TABPAGE_CTRL,64091,
 HID_XML_FILTER_TABPAGE_XSLT,64062,
-HID_XML_FILTER_TEST,64055,
 HID_XML_FILTER_TEST_CLOSE,64086,
 HID_XML_FILTER_TEST_DIALOG,64076,
 HID_XML_FILTER_TEST_EXPORT_BROWSE,64077,
diff --git a/source/text/shared/01/0615.xhp 
b/source/text/shared/01/0615.xhp
index c274efe..53e962a 100644
--- a/source/text/shared/01/0615.xhp
+++ b/source/text/shared/01/0615.xhp
@@ -44,7 +44,7 @@
 XML filters; settings
 mw deleted "XSLT based filters;"
 
-
+
 XML Filter Settings
 Opens the XML Filter 
Settings dialog, where you can create, edit, delete, and test filters to 
import and to export XML files.
 
@@ -90,9 +90,9 @@
 
 
 The XHTML 
export filter produces valid "XHTML 1.0 Strict" output for Writer, Calc, Draw, 
and Impress documents.
-
+
 Filter list
-Select one or more filters, then 
click one of the buttons.
+Select one or 
more filters, then click one of the buttons.
 Some 
filters are only available as optional components during the %PRODUCTNAME 
installation. To install an optional filter, run the %PRODUCTNAME Setup 
application, select "Modify", and then select the filter that you want in the 
list of modules.
 The lists shows the name and the type of the installed 
filters.
 
@@ -106,30 +106,30 @@
 Double-click a name to edit the filter.
 
 
-
+
 New
-Opens a dialog with the name of a 
new filter.
-
+Opens a dialog with 
the name of a new filter.
+
 Edit
-Opens a dialog with the name of 
the selected file.
-
+Opens a dialog with 
the name of the selected file.
+
 Test XSLTs
-Opens a dialog with the name of 
the selected file.
-
+Opens a dialog with 
the name of the selected file.
+
 Delete
-Deletes the selected file after 
you confirm the dialog that follows.
-
+Deletes the 
selected file after you confirm the dialog that follows.
+
 Save as Package
-Displays a Save as 
dialog to save the selected file as an XSLT filter package 
(*.jar).
-
+Displays a Save 
as dialog to save the selected file as an XSLT filter package 
(*.jar).
+
 Open Package
-Displays an Open 
dialog to open a filter from an XSLT filter package 
(*.jar).
-
+Displays an 
Open dialog to open a filter from an XSLT filter package 
(*.jar).
+
 Help
-Displays the help page 
for this dialog.
-
+Displays the help 
page for this dialog.
+
 Close
-Closes the 
dialog.
+Closes the 
dialog.
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 5 commits - desktop/source filter/qa filter/source sw/source sw/uiconfig

[Libreoffice Gerrit user]

 desktop/source/deployment/gui/dp_gui_theextmgr.cxx|   41 +++---
 filter/qa/cppunit/data/tga/fail/CVE-2012-3755-1.tga   |binary
 filter/source/xsltdialog/hidother.src |1 
 filter/source/xsltdialog/xmlfilterdialogcomponent.cxx |   23 +-
 filter/source/xsltdialog/xmlfilterhelpids.hrc |1 
 filter/source/xsltdialog/xmlfiltersettingsdialog.cxx  |8 +--
 filter/source/xsltdialog/xmlfiltersettingsdialog.hxx  |2 
 sw/source/ui/dialog/wordcountdialog.cxx   |   12 +
 sw/source/ui/inc/wordcountdialog.hxx  |3 -
 sw/uiconfig/swriter/ui/wordcount.ui   |   30 ++---
 10 files changed, 65 insertions(+), 56 deletions(-)

New commits:
commit 3fa0d17b39bebabcf18e35df38572e4d51d05251
Author: Caolán McNamara 
Date:   Wed Nov 21 11:08:10 2012 +

add regression test for CVE-2012-3755

Change-Id: I68352532016a9db370ddd6e69e4efe962763f001

diff --git a/filter/qa/cppunit/data/tga/fail/CVE-2012-3755-1.tga 
b/filter/qa/cppunit/data/tga/fail/CVE-2012-3755-1.tga
new file mode 100644
index 000..963e5d3
Binary files /dev/null and 
b/filter/qa/cppunit/data/tga/fail/CVE-2012-3755-1.tga differ
commit fd760bf54122b3c20e4d142a4006909aa5143003
Author: Caolán McNamara 
Date:   Wed Nov 21 10:56:58 2012 +

bump xmlfilter settings dialog for new helpids

Change-Id: If15ba82db3910bf0948f6dd4ed984a05e68a6080

diff --git a/filter/source/xsltdialog/hidother.src 
b/filter/source/xsltdialog/hidother.src
index cf2816d..c6947c7 100644
--- a/filter/source/xsltdialog/hidother.src
+++ b/filter/source/xsltdialog/hidother.src
@@ -20,7 +20,6 @@
 
 hidspecial HID_XML_SOURCE_FILE_DIALOG   { HelpId = 
HID_XML_SOURCE_FILE_DIALOG; };
 hidspecial HID_XML_SOURCE_FILE_VALIDATE { HelpId = 
HID_XML_SOURCE_FILE_VALIDATE; };
-hidspecial HID_XML_FILTER_LIST  { HelpId = 
HID_XML_FILTER_LIST; };
 
 hidspecial HID_XML_FILTER_TABDIALOG { HelpId = 
HID_XML_FILTER_TABDIALOG; };
 hidspecial HID_XML_FILTER_TABPAGE_BASIC { HelpId = 
HID_XML_FILTER_TABPAGE_BASIC; };
diff --git a/filter/source/xsltdialog/xmlfilterhelpids.hrc 
b/filter/source/xsltdialog/xmlfilterhelpids.hrc
index 712a8ef..338604d 100644
--- a/filter/source/xsltdialog/xmlfilterhelpids.hrc
+++ b/filter/source/xsltdialog/xmlfilterhelpids.hrc
@@ -20,7 +20,6 @@
 
 #define HID_XML_SOURCE_FILE_DIALOG  
"FILTER_HID_XML_SOURCE_FILE_DIALOG"
 #define HID_XML_SOURCE_FILE_VALIDATE
"FILTER_HID_XML_SOURCE_FILE_VALIDATE"
-#define HID_XML_FILTER_LIST 
"FILTER_HID_XML_FILTER_LIST"
 
 #define HID_XML_FILTER_TABDIALOG
"FILTER_HID_XML_FILTER_TABDIALOG"
 #define HID_XML_FILTER_TABPAGE_BASIC
"FILTER_HID_XML_FILTER_TABPAGE_BASIC"
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx 
b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 69b3e98..d98b5cb 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -78,7 +78,7 @@ XMLFilterSettingsDialog::XMLFilterSettingsDialog(Window* 
pParent,
 m_pFilterListBox->SetDoubleClickHdl( LINK( this, XMLFilterSettingsDialog, 
DoubleClickHdl_Impl ) );
 m_pFilterListBox->SetAccessibleName(RESIDSTR(STR_XML_FILTER_LISTBOX));
 m_pCtrlFilterList->SetAccessibleName(RESIDSTR(STR_XML_FILTER_LISTBOX));
-m_pFilterListBox->SetHelpId( HID_XML_FILTER_LIST );
+m_pFilterListBox->SetHelpId(m_pCtrlFilterList->GetHelpId());
 
 m_pPBNew->SetClickHdl(LINK( this, XMLFilterSettingsDialog, ClickHdl_Impl ) 
);
 m_pPBEdit->SetClickHdl(LINK( this, XMLFilterSettingsDialog, ClickHdl_Impl 
) );
commit 9aa8f75a9cd3f42319945b2ac147fba2919fb5df
Author: Caolán McNamara 
Date:   Wed Nov 21 10:17:28 2012 +

remove OUSTR define

Change-Id: I7b78fa23760af3641dcaf47bc90a995ae215404b

diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx 
b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
index d8a80fd..579c5bc 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
@@ -33,11 +33,9 @@
 #include "dp_identifier.hxx"
 #include "dp_update.hxx"
 
-#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
-
-#define USER_PACKAGE_MANAGEROUSTR("user")
-#define SHARED_PACKAGE_MANAGER  OUSTR("shared")
-#define BUNDLED_PACKAGE_MANAGER OUSTR("bundled")
+#define USER_PACKAGE_MANAGEROUString("user")
+#define SHARED_PACKAGE_MANAGER  OUString("shared")
+#define BUNDLED_PACKAGE_MANAGER OUString("bundled")
 
 using namespace ::com::sun::star;
 using ::rtl::OUString;
@@ -66,24 +64,24 @@ TheExtensionManager::TheExtensionManager( Window *pParent,
 uno::Reference< lang::XMultiServiceFactory > xConfig(
 configuration::theDefaultProvider::get(xContext));

[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - officecfg/registry

[Libreoffice Gerrit user]

 officecfg/registry/data/org/openoffice/VCL.xcu |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 970c553c5165156932dd91eabd2b559a4c5606dd
Author: Lior Kaplan 
Date:   Thu Oct 18 18:56:06 2012 +0200

fdo#55034 Update default Hebrew font from Lucida Sans to Lucida Sans Unicode

Change-Id: Ia2204dda0cb452a4ce38a44db61d17d6802b5a38
(cherry picked from commit a40f08c1ac97078fa501da7c6dc456aa12146f25)

Signed-off-by: Lior Kaplan 

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu 
b/officecfg/registry/data/org/openoffice/VCL.xcu
index e01d207..f3763e4 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -187,19 +187,19 @@
 Tahoma;Arial Unicode MS;Lucida Sans Unicode;DejaVu Sans;Albany 
AMT;Albany;Arial;Nimbus Sans L;Interface 
User;Geneva;Tahoma;Dialog;Lucida;Helvetica;Helmet;Interface System;Sans 
Serif
  
  
-Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin 
CLM;Miriam Mono CLM;Lucidasans;Lucida Sans;Arial Unicode MS
+Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin 
CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS
  
  
-Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin 
CLM;Miriam Mono CLM;Lucidasans;Lucida Sans;Arial Unicode MS
+Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin 
CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS
  
  
-Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin 
CLM;Miriam Mono CLM;Lucidasans;Lucida Sans;Arial Unicode MS
+Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin 
CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS
  
  
-Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin 
CLM;Miriam Mono CLM;Lucidasans;Lucida Sans;Arial Unicode MS
+Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin 
CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS
  
  
-Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin 
CLM;Miriam Mono CLM;Lucidasans;Lucida Sans;Arial Unicode MS
+Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin 
CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS
  
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - 2 commits - extensions/source i18npool/source

[Libreoffice Gerrit user]

 extensions/source/nsplugin/source/npshell.cxx   |2 +-
 i18npool/source/ordinalsuffix/ordinalsuffix.cxx |8 
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit f87d1103e40739afb65cf19ac2004aa2cb74316b
Author: Michael Meeks 
Date:   Mon Nov 12 21:07:13 2012 +

WaE: fix windows build of npshell.
(cherry picked from commit 655ef3e507d1bc41e67cd7529f827ac58fb9bab0)

Signed-off-by: Stephan Bergmann 

diff --git a/extensions/source/nsplugin/source/npshell.cxx 
b/extensions/source/nsplugin/source/npshell.cxx
index 52e85b6..ae2cf91 100644
--- a/extensions/source/nsplugin/source/npshell.cxx
+++ b/extensions/source/nsplugin/source/npshell.cxx
@@ -99,7 +99,7 @@
  ***/
 
 static NSP_Mute_Obj send_lock = NSP_New_Mute_Obj();
-static NSP_PIPE_FD write_fd = -1;
+static NSP_PIPE_FD write_fd = (NSP_PIPE_FD)-1;
 
 
 long int NSP_WriteToPipe(NSP_PIPE_FD fp, void* buf, unsigned long int len)
commit 51f2005c530e258b791c215a11c2a64bf8830137
Author: Caolán McNamara 
Date:   Tue Nov 6 15:13:46 2012 +

WaE: duplicated variable name

Change-Id: Id42116f2ddfe679b1a995590e35a619ff8d82d7e
(cherry picked from commit fdc76a03f50e1291a90035befac67b8205c7e770)

Signed-off-by: Stephan Bergmann 

diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx 
b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
index 3d7f560..4124c92 100644
--- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
+++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
@@ -98,8 +98,8 @@ uno::Sequence< OUString > SAL_CALL 
OrdinalSuffix::getOrdinalSuffix( sal_Int32 nN
 
 icu::UnicodeString sFormatWithNoOrdinal;
 icu::Formattable ftmNumber((int32_t)nNumber);
-icu::FieldPosition icuPos;
-xNumberFormat->format(ftmNumber, sFormatWithNoOrdinal, icuPos, nCode);
+icu::FieldPosition icuPosA;
+xNumberFormat->format(ftmNumber, sFormatWithNoOrdinal, icuPosA, nCode);
 if (!U_SUCCESS(nCode))
 return retValue;
 
@@ -114,8 +114,8 @@ uno::Sequence< OUString > SAL_CALL 
OrdinalSuffix::getOrdinalSuffix( sal_Int32 nN
 
 // format the string
 icu::UnicodeString sFormatWithOrdinal;
-icu::FieldPosition icuPos;
-formatter.format( (int32_t)nNumber, ruleSet, sFormatWithOrdinal, 
icuPos, nCode );
+icu::FieldPosition icuPosB;
+formatter.format((int32_t)nNumber, ruleSet, sFormatWithOrdinal, 
icuPosB, nCode);
 
 if (!U_SUCCESS(nCode))
 continue;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: src/docrecord.py src/docstream.py

[Miklos Vajna]

 src/docrecord.py |   43 +++
 src/docstream.py |8 +++-
 2 files changed, 50 insertions(+), 1 deletion(-)

New commits:
commit 15d81595c684075c18915029b1ca613b6266e2d3
Author: Miklos Vajna 
Date:   Wed Nov 21 12:22:37 2012 +0100

dump SttbfAtnBkmk

diff --git a/src/docrecord.py b/src/docrecord.py
index e9e0f3a..7378068 100755
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -595,6 +595,49 @@ class SttbfFfn(DOCDirStream):
 print ''
 print ''
 
+class ATNBE(DOCDirStream):
+"""The ATNBE structure contains information about an annotation bookmark 
in the document."""
+size = 10 # in bytes, see 2.9.4
+def __init__(self, sttbfAtnBkmk):
+DOCDirStream.__init__(self, sttbfAtnBkmk.bytes)
+self.pos = sttbfAtnBkmk.pos
+
+def dump(self):
+print ''
+self.printAndSet("bmc", self.getuInt16())
+self.pos += 2
+self.printAndSet("ITag", self.getuInt32())
+self.pos += 4
+self.printAndSet("ITagOld", self.getuInt32())
+self.pos += 4
+print ''
+
+class SttbfAtnBkmk(DOCDirStream):
+"""The SttbfAtnBkmk structure is an STTB whose strings are all of zero 
length."""
+def __init__(self, mainStream, offset, size):
+DOCDirStream.__init__(self, 
mainStream.doc.getDirectoryStreamByName("1Table").bytes)
+self.pos = offset
+self.size = size
+
+def dump(self):
+print '' 
% (self.pos, self.size)
+self.printAndSet("fExtended", self.getuInt16())
+self.pos += 2
+self.printAndSet("cData", self.getuInt16())
+self.pos += 2
+self.printAndSet("cbExtra", self.getuInt16())
+self.pos += 2
+for i in range(self.cData):
+cchData = self.getuInt16()
+print '' % (i, 
self.pos, cchData)
+self.pos += 2
+print '' % (i, 
self.pos, ATNBE.size)
+atnbe = ATNBE(self)
+atnbe.dump()
+self.pos += ATNBE.size
+print ''
+print ''
+
 class Stshif(DOCDirStream):
 """The Stshif structure specifies general stylesheet information."""
 def __init__(self, bytes, mainStream, offset):
diff --git a/src/docstream.py b/src/docstream.py
index 928bb29..91644dd 100755
--- a/src/docstream.py
+++ b/src/docstream.py
@@ -263,7 +263,7 @@ class WordDocumentStream(DOCDirStream):
 ["fcGrpXstAtnOwners"],
 ["lcbGrpXstAtnOwners"],
 ["fcSttbfAtnBkmk"],
-["lcbSttbfAtnBkmk"],
+["lcbSttbfAtnBkmk", self.handleLcbSttbfAtnBkmk],
 ["fcUnused2"],
 ["lcbUnused2"],
 ["fcUnused3"],
@@ -424,6 +424,12 @@ class WordDocumentStream(DOCDirStream):
 plcfandRef = docrecord.PlcfandRef(self, offset, size)
 plcfandRef.dump()
 
+def handleLcbSttbfAtnBkmk(self):
+offset = self.fcSttbfAtnBkmk
+size = self.lcbSttbfAtnBkmk
+sttbfAtnBkmk = docrecord.SttbfAtnBkmk(self, offset, size)
+sttbfAtnBkmk.dump()
+
 def dumpFibRgFcLcb97(self, name):
 print '<%s type="FibRgFcLcb97" size="744 bytes">' % name
 self.__dumpFibRgFcLcb97()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Funding Wishlist

[Jonathan Aquilina]

Thorsten I have my imac which isnt doing much when im not using it and I
would be more then happy to setup my imac to be a tinderbox.

its an quad core intel i5 with 16gb of ram. Only problem I have is no 10.4
SDK :(

On Wed, Nov 21, 2012 at 12:07 PM, Thorsten Behrens <
t...@documentfoundation.org> wrote:

> Marc Paré wrote:
> > We are seriously looking at different teams' wishlists. Please do
> > take a little time out of your busy schedule and speak to your teams
> > about any funding for items that you think may be of importance to
> > your team or the enhance the functioning of your team's work on the
> > project.
> >
> Hi Marc,
>
> thanks a lot for running this - and yes, I think the dev team would
> benefit from some more tinderboxes. Unless there's other support
> coming up, I'd like to suggest buying another Mac box for
> gerrit/tinderboxing. I have an offer for a used Mac Mini as follows:
>
> Mac Mini, last year's version, 2,7 GHz DualCore i7, 4 GB RAM, AMD
> Radeon HD 6630M, OS X Lion, Samsung SSD 128 GB 470 Series MLC, HDMI,
> DVI.
>
> (like http://support.apple.com/kb/SP632 but with bigger cpu & ssd)
>
> Quote has it for € 700.
>
> Cheers,
>
> -- Thorsten
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>
>


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

[Libreoffice-commits] .: solenv/bin

[Libreoffice Gerrit user]

 solenv/bin/install-gdb-printers |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d85fd8a85501547d5bb87822d2589a07aed7f2d6
Author: Stephan Bergmann 
Date:   Wed Nov 21 12:41:41 2012 +0100

Fix install-gdb-printers for Mac OS X

Change-Id: I685d277806e757fc6247f34d4db7386955dab7b7

diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers
index 51ab9e2..c478929 100755
--- a/solenv/bin/install-gdb-printers
+++ b/solenv/bin/install-gdb-printers
@@ -168,8 +168,8 @@ if [[ ${DESTDIR}${pythondir} != ${GDBDIR} ]]; then
 cp -pr "${GDBDIR}/libreoffice" "${DESTDIR}${pythondir}"
 fi
 
-make_autoload cppu ure/lib libuno_cppu."$DYLIB".3
-make_autoload sal ure/lib libuno_sal."$DYLIB".3
+make_autoload cppu ure-link/lib libuno_cppu."$DYLIB".3
+make_autoload sal ure-link/lib libuno_sal."$DYLIB".3
 make_autoload svl program libsvllo."$DYLIB"
 make_autoload sw program libswlo."$DYLIB"
 make_autoload tl program libtllo."$DYLIB"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: vcl/unx

[Libreoffice Gerrit user]

 vcl/unx/gtk/window/gloactiongroup.cxx |4 
 vcl/unx/gtk/window/glomenu.cxx|4 
 vcl/unx/gtk/window/gtksalmenu.cxx |4 
 vcl/unx/gtk/window/hudawareness.cxx   |7 ++-
 4 files changed, 18 insertions(+), 1 deletion(-)

New commits:
commit 463f34737e01ca277a7b87741aed8daad9bc45cf
Author: Thorsten Behrens 
Date:   Wed Nov 21 13:03:26 2012 +0100

UnityMenu: don't build when ENABLE_GMENU_INTEGRATION is not on

Change-Id: Iba9e6c3d2483a20ed3ec33b85b4c5f78830fd2f6

diff --git a/vcl/unx/gtk/window/gloactiongroup.cxx 
b/vcl/unx/gtk/window/gloactiongroup.cxx
index ade8551..0d253ef 100644
--- a/vcl/unx/gtk/window/gloactiongroup.cxx
+++ b/vcl/unx/gtk/window/gloactiongroup.cxx
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#ifdef ENABLE_GMENU_INTEGRATION
+
 #include 
 
 #include 
@@ -404,4 +406,6 @@ g_lo_action_group_clear (GLOActionGroup  *group)
 }
 }
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk/window/glomenu.cxx b/vcl/unx/gtk/window/glomenu.cxx
index a712979..c5a0126 100644
--- a/vcl/unx/gtk/window/glomenu.cxx
+++ b/vcl/unx/gtk/window/glomenu.cxx
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#ifdef ENABLE_GMENU_INTEGRATION
+
 #include 
 #include 
 
@@ -649,4 +651,6 @@ g_lo_menu_class_init (GLOMenuClass *klass)
 model_class->get_item_links = g_lo_menu_get_item_links;
 }
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx 
b/vcl/unx/gtk/window/gtksalmenu.cxx
index 30c9399..5474c7b 100644
--- a/vcl/unx/gtk/window/gtksalmenu.cxx
+++ b/vcl/unx/gtk/window/gtksalmenu.cxx
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#ifdef ENABLE_GMENU_INTEGRATION
+
 #include 
 
 #include 
@@ -797,4 +799,6 @@ GtkSalMenuItem::~GtkSalMenuItem()
 {
 }
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk/window/hudawareness.cxx 
b/vcl/unx/gtk/window/hudawareness.cxx
index 69261c6..1ca2ffa 100644
--- a/vcl/unx/gtk/window/hudawareness.cxx
+++ b/vcl/unx/gtk/window/hudawareness.cxx
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-
 /*
  * This file is part of the LibreOffice project.
  *
@@ -8,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#ifdef ENABLE_GMENU_INTEGRATION
+
 #include 
 #include 
 
@@ -102,3 +103,7 @@ hud_awareness_unregister (GDBusConnection *connection,
 {
   g_dbus_connection_unregister_object (connection, subscription_id);
 }
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Shared Mac build host (was: Re: Funding Wishlist)

[Thorsten Behrens]

Jonathan Aquilina wrote:
> Thorsten I have my imac which isnt doing much when im not using it and I
> would be more then happy to setup my imac to be a tinderbox.
>
Hi Jonathan,

that's independently very useful - and you don't need that 10.4 SDK
for just building.

If that box can successfully build master, setting up a tinderbox is
trivial - just run tinbuild2 in that tree from
http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/

Beyond that, having a nice powerful box where interested project
members can get access to is IMO imperative - or can you commit to
that as well?
 
Cheers,

-- Thorsten


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

[Libreoffice-commits] .: cairo/ExternalPackage_cairo.mk cairo/ExternalPackage_pixman.mk

[Libreoffice Gerrit user]

 cairo/ExternalPackage_cairo.mk  |1 +
 cairo/ExternalPackage_pixman.mk |1 +
 2 files changed, 2 insertions(+)

New commits:
commit fc54a7bac751e8497ecaa92900954024a0b53cc9
Author: Luboš Luňák 
Date:   Wed Nov 21 13:31:32 2012 +0100

deliver also .so. libraries

Otherwise dynamic loader doesn't find them there.

Change-Id: Idabec8e0fca48562164d90f5d0afdf3ebf5615cb

diff --git a/cairo/ExternalPackage_cairo.mk b/cairo/ExternalPackage_cairo.mk
index 5830d4d..e61cbb1 100644
--- a/cairo/ExternalPackage_cairo.mk
+++ b/cairo/ExternalPackage_cairo.mk
@@ -12,5 +12,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,cairo,cairo))
 $(eval $(call gb_ExternalPackage_use_external_project,cairo,cairo))
 
 $(eval $(call 
gb_ExternalPackage_add_file,cairo,lib/libcairo.so,src/.libs/libcairo.so.2.11000.2))
+$(eval $(call 
gb_ExternalPackage_add_file,cairo,lib/libcairo.so.2,src/.libs/libcairo.so.2.11000.2))
 
 # vim: set noet sw=4 ts=4:
diff --git a/cairo/ExternalPackage_pixman.mk b/cairo/ExternalPackage_pixman.mk
index ec5f86b..f7816fd 100644
--- a/cairo/ExternalPackage_pixman.mk
+++ b/cairo/ExternalPackage_pixman.mk
@@ -12,5 +12,6 @@ $(eval $(call 
gb_ExternalPackage_ExternalPackage,pixman,pixman))
 $(eval $(call gb_ExternalPackage_use_external_project,pixman,pixman))
 
 $(eval $(call 
gb_ExternalPackage_add_file,pixman,lib/libpixman-1.so,pixman/.libs/libpixman-1.so.0.24.4))
+$(eval $(call 
gb_ExternalPackage_add_file,pixman,lib/libpixman-1.so.0,pixman/.libs/libpixman-1.so.0.24.4))
 
 # 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] .: fpicker/source

[Libreoffice Gerrit user]

 fpicker/source/office/iodlg.cxx |7 +--
 fpicker/source/office/iodlg.src |4 ++--
 2 files changed, 3 insertions(+), 8 deletions(-)

New commits:
commit a8c2cb0e6d0b9b301887be176694592f8ecda0c4
Author: Caolán McNamara 
Date:   Wed Nov 21 12:46:01 2012 +

SvtURLBox derives from ComboBox not Edit

so should use ComboBox in .src file once that's done we can remove the dummy
Edit's which seem to exist only to get the right size/position onto the
SvtURLBox. All of this removes the resource assert spew on loading
the built-in filepicker

Change-Id: I9e6249bc34ee563fc73784c46bb733901d4d55d6

diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 0e60cfb..1f814aa 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -507,12 +507,9 @@ void SvtFileDialog::Init_Impl
 // Create control element, the order defines the tab control.
 _pImp->_pFtFileName = new FixedText( this, SvtResId( 
FT_EXPLORERFILE_FILENAME ) );
 
-SvtURLBox* pURLBox = new SvtURLBox( this );
+SvtURLBox* pURLBox = new SvtURLBox( this, SvtResId( 
ED_EXPLORERFILE_FILENAME ) );
 pURLBox->SetUrlFilter( &m_aURLFilter );
 _pImp->_pEdFileName = pURLBox;
-
-Edit aDummy( this, SvtResId( ED_EXPLORERFILE_FILENAME ) );
-_pImp->_pEdFileName->SetPosSizePixel( aDummy.GetPosPixel(), 
aDummy.GetSizePixel() );
 _pImp->_pEdFileName->Show();
 pURLBox->SetSelectHdl( LINK( this, SvtFileDialog, EntrySelectHdl_Impl ) );
 pURLBox->SetOpenHdl( STATIC_LINK( this, SvtFileDialog, OpenHdl_Impl ) );
@@ -547,10 +544,8 @@ void SvtFileDialog::Init_Impl
 }
 }
 
-Edit anOtherDummy( this, SvtResId( ED_EXPLORERFILE_CURRENTPATH ) );
 _pImp->_pEdCurrentPath = new SvtURLBox( this, 
SvtResId(ED_EXPLORERFILE_CURRENTPATH) );
 _pImp->_pEdCurrentPath->SetUrlFilter( &m_aURLFilter );
-_pImp->_pEdCurrentPath->SetPosSizePixel( anOtherDummy.GetPosPixel(), 
anOtherDummy.GetSizePixel() );
 _pImp->_pEdCurrentPath->Show();
 
 _pImp->_pBtnFileOpen = new PushButton( this, SvtResId( 
BTN_EXPLORERFILE_OPEN ) );
diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src
index 4a25355..75feb9c 100644
--- a/fpicker/source/office/iodlg.src
+++ b/fpicker/source/office/iodlg.src
@@ -57,7 +57,7 @@ ModalDialog DLG_FPICKER_EXPLORERFILE
 Sizeable = TRUE;
 HelpId = HID_EXPLORERDLG_FILE ;
 Size = MAP_APPFONT ( 280 , 174 ) ;
-Edit ED_EXPLORERFILE_CURRENTPATH
+ComboBox ED_EXPLORERFILE_CURRENTPATH
 {
 Pos = MAP_APPFONT ( 6 , 6 ) ;
 Size = MAP_APPFONT ( 90 , 12 ) ;
@@ -113,7 +113,7 @@ ModalDialog DLG_FPICKER_EXPLORERFILE
 Size = MAP_APPFONT ( 50 , 10 ) ;
 Text [ en-US ] = "File ~name:" ;
 };
-Edit ED_EXPLORERFILE_FILENAME
+ComboBox ED_EXPLORERFILE_FILENAME
 {
 HelpID = "fpicker:Edit:DLG_SVT_EXPLORERFILE:ED_EXPLORERFILE_FILENAME";
 Pos = MAP_APPFONT ( 59 , 117 ) ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Tinderbox failure, Win-x86@7-MinGW, MASTER, last success: 2012-11-20 19:54:45

[Lubos Lunak]

On Wednesday 21 of November 2012, ke...@suse.cz wrote:
> Hi folks,
>
> One of you broke the build of LibreOffice with your commit :-(
> Please commit and push a fix ASAP!
>
> Full log available at http://tinderbox.libreoffice.org/MASTER/status.html
>
> Tinderbox info:
>
>   Box name: Win-x86@7-MinGW
...
> unzip:  cannot find or open
> /local/home/tinderbox/master-mingw/src/fc188d2ed5c2cbcf7a021b34b9f88478-icu
>dt49l-subset.zip,
> /local/home/tinderbox/master-mingw/src/fc188d2ed5c2cbcf7a021b34b9f88478-icu
>dt49l-subset.zip.zip or
> /local/home/tinderbox/master-mingw/src/fc188d2ed5c2cbcf7a021b34b9f88478-icu
>dt49l-subset.zip.ZIP. dmake:  Error code 9, while making
> './unxlngx6.pro/misc/build/so_configured_so_icu' ERROR: error 65280
> occurred while making /local/home/tinderbox/master-mingw/icu

 It seems specifying tarballs to download in configure.ac doesn't work well 
with cross-compilation. I can "fix" this by getting the tarball manually, if 
one of the tarballs for ICU is not in src/, it won't be downloaded.




icu.tar.gz
Description: application/tgz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: vcl/unx

[Libreoffice Gerrit user]

 vcl/unx/gtk/window/gloactiongroup.cxx |2 ++
 vcl/unx/gtk/window/glomenu.cxx|6 --
 vcl/unx/gtk/window/gtksalmenu.cxx |4 ++--
 vcl/unx/gtk/window/hudawareness.cxx   |5 -
 4 files changed, 12 insertions(+), 5 deletions(-)

New commits:
commit f5cc79a1202f3c8933d846756cf0a9fe8df49682
Author: Thorsten Behrens 
Date:   Wed Nov 21 14:10:40 2012 +0100

UnityMenu: ensure ENABLE_GMENU_INTEGRATION is actually ever set

Change-Id: I6b7dfd5dd80f45c216c9ec240a390b6434a12672

diff --git a/vcl/unx/gtk/window/gloactiongroup.cxx 
b/vcl/unx/gtk/window/gloactiongroup.cxx
index 0d253ef..f8132a0 100644
--- a/vcl/unx/gtk/window/gloactiongroup.cxx
+++ b/vcl/unx/gtk/window/gloactiongroup.cxx
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include 
+
 #ifdef ENABLE_GMENU_INTEGRATION
 
 #include 
diff --git a/vcl/unx/gtk/window/glomenu.cxx b/vcl/unx/gtk/window/glomenu.cxx
index c5a0126..8227fb1 100644
--- a/vcl/unx/gtk/window/glomenu.cxx
+++ b/vcl/unx/gtk/window/glomenu.cxx
@@ -7,11 +7,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifdef ENABLE_GMENU_INTEGRATION
-
 #include 
 #include 
 
+#include 
+
+#ifdef ENABLE_GMENU_INTEGRATION
+
 #include 
 
 struct _GLOMenu
diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx 
b/vcl/unx/gtk/window/gtksalmenu.cxx
index 5474c7b..d3c20a2 100644
--- a/vcl/unx/gtk/window/gtksalmenu.cxx
+++ b/vcl/unx/gtk/window/gtksalmenu.cxx
@@ -7,10 +7,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifdef ENABLE_GMENU_INTEGRATION
-
 #include 
 
+#ifdef ENABLE_GMENU_INTEGRATION
+
 #include 
 #include 
 #include 
diff --git a/vcl/unx/gtk/window/hudawareness.cxx 
b/vcl/unx/gtk/window/hudawareness.cxx
index 1ca2ffa..1f2e56f 100644
--- a/vcl/unx/gtk/window/hudawareness.cxx
+++ b/vcl/unx/gtk/window/hudawareness.cxx
@@ -7,9 +7,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include 
+
+#include 
+
 #ifdef ENABLE_GMENU_INTEGRATION
 
-#include 
 #include 
 
 typedef struct
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: android/Bootstrap android/experimental sal/android

[Libreoffice Gerrit user]

 android/Bootstrap/src/org/libreoffice/android/Bootstrap.java |6 
 android/experimental/LibreOffice4Android/Makefile|8 
 sal/android/lo-bootstrap.c   |  102 +--
 3 files changed, 100 insertions(+), 16 deletions(-)

New commits:
commit 970b53e050014006997410be046366fd8f1023f1
Author: Tor Lillqvist 
Date:   Wed Nov 21 14:55:09 2012 +0200

Enable storing some files gzipped in the .apk

We gzip them separately in the Makefile and the gzipped result will be
stored without (further) compression in the .apk.

Use this to store the ttf font files. Shaves off a bit .apk size.

This might seem a bit odd way to do it, why not store these files in
the normal Zip compressed fashion in the .apk? It seems hard to tell
Ant (based on path, not extension) what files to compress and what
not, so we have to keep telling it to not (further) compress any files
at all.

Change-Id: I0d40d8811e6c9df6b28c285845b1db225507f5d4

diff --git a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java 
b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
index 2c8d2e7..7b01eb8 100644
--- a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
+++ b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
@@ -59,6 +59,7 @@ public class Bootstrap extends NativeActivity
 // seems.
 
 private static native boolean setup(String dataDir,
+String cacheDir,
 String apkFile,
 String[] ld_library_path);
 
@@ -133,7 +134,10 @@ public class Bootstrap extends NativeActivity
 
 String[] llpa = llp.split(":");
 
-if (!setup(dataDir, 
activity.getApplication().getPackageResourcePath(), llpa))
+if (!setup(dataDir,
+   activity.getApplication().getCacheDir().getAbsolutePath(),
+   activity.getApplication().getPackageResourcePath(),
+   llpa))
 return;
 
 // Extract files from the .apk that can't be used mmapped directly 
from it
diff --git a/android/experimental/LibreOffice4Android/Makefile 
b/android/experimental/LibreOffice4Android/Makefile
index bbe1587..c48635c 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -118,13 +118,13 @@ copy-stuff:
 # understand "/assets" paths.
mkdir -p assets/unpack/etc/fonts
cp fonts.conf assets/unpack/etc/fonts
-   mkdir -p assets/unpack/user/fonts
 # $UserInstallation/user/fonts is added to the fontconfig path in
 # vcl/generic/fontmanager/helper.cxx: psp::getFontPath(). UserInstallation is
 # set to the app's data dir above.
-   cp $(OUTDIR)/pck/Liberation*.ttf assets/unpack/user/fonts
-   cp $(OUTDIR)/pck/Gen*.ttf assets/unpack/user/fonts
-   cp $(OUTDIR)/pck/opens___.ttf assets/unpack/user/fonts
+   mkdir -p assets/gz.unpack/user/fonts
+   for F in $(OUTDIR)/pck/Liberation*.ttf $(OUTDIR)/pck/Gen*.ttf 
$(OUTDIR)/pck/opens___.ttf; do \
+   gzip -9 <$$F >assets/gz.unpack/user/fonts/`basename $$F`; \
+   done
 #
 # Then gdbserver and gdb.setup so that we can debug with ndk-gdb.
 #
diff --git a/sal/android/lo-bootstrap.c b/sal/android/lo-bootstrap.c
index b29fb7d..f1f2155 100644
--- a/sal/android/lo-bootstrap.c
+++ b/sal/android/lo-bootstrap.c
@@ -41,6 +41,7 @@
 #include 
 #include 
 
+#include 
 #include 
 
 #include 
@@ -82,6 +83,7 @@ static int sleep_time = 0;
 
 /* These are valid / used in all apps. */
 static const char *data_dir;
+static const char *cache_dir;
 static const char **library_locations;
 static void *apk_file;
 static int apk_file_size;
@@ -312,21 +314,24 @@ JNI_OnLoad(JavaVM* vm, void* reserved)
 }
 
 // public static native boolean setup(String dataDir,
+//String cacheDir,
 //String apkFile,
 //String[] ld_library_path);
 
 __attribute__ ((visibility("default")))
 jboolean
-Java_org_libreoffice_android_Bootstrap_setup__Ljava_lang_String_2Ljava_lang_String_2_3Ljava_lang_String_2
+Java_org_libreoffice_android_Bootstrap_setup__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2_3Ljava_lang_String_2
 (JNIEnv* env,
  jobject clazz,
  jstring dataDir,
+ jstring cacheDir,
  jstring apkFile,
  jobjectArray ld_library_path)
 {
 struct stat st;
 int i, n, fd;
 const char *dataDirPath;
+const char *cacheDirPath;
 const char *apkFilePath;
 char *lib_dir;
 
@@ -359,6 +364,12 @@ 
Java_org_libreoffice_android_Bootstrap_setup__Ljava_lang_String_2Ljava_lang_Stri
 for (n = 0; library_locations[n] != NULL; n++)
 LOGI("library_locations[%d] = %s", n, library_locations[n]);
 
+cacheDirPath = (*env)->GetStringUTFChars(env, cacheDir, NULL);
+
+cache_dir = strdup(cach

[Libreoffice-commits] .: l10ntools/source

[Libreoffice Gerrit user]

 l10ntools/source/localize.cxx |3 ++-
 l10ntools/source/renewpo.cxx  |4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 1c84f6f475a448333f844b0e25d895d117b90563
Author: Thorsten Behrens 
Date:   Wed Nov 21 14:16:48 2012 +0100

Fix build for old gcc

Workaround extra temporaries created by gcc-4.0 on mac - since here
PoHeader has private copy ctor.

Change-Id: I6faf99f78c11452f6adf6f1f18e1ceda9e23e7a2

diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index f20ed50..cf21193 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -272,7 +272,8 @@ void handleCommand(
 inPath.lastIndexOf('/')- nProjectInd),
 RTL_TEXTENCODING_UTF8 );
 
-rPoOutPut.writeHeader(PoHeader(relativPath));
+PoHeader aTmp(relativPath);
+rPoOutPut.writeHeader(aTmp);
 }
 }
 while (!in.eof())
diff --git a/l10ntools/source/renewpo.cxx b/l10ntools/source/renewpo.cxx
index 13a7016..60466fc 100644
--- a/l10ntools/source/renewpo.cxx
+++ b/l10ntools/source/renewpo.cxx
@@ -164,7 +164,9 @@ void HandleLanguage(const OString& LangEntryName, const 
OString& rOldPath,
 << sOldPoFileName.getStr() << endl;
 return;
 }
-aNewPo.writeHeader(PoHeader(aOldPo));
+
+PoHeader aTmp(aOldPo);
+aNewPo.writeHeader(aTmp);
 aOldPo.close();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: android/Bootstrap sal/android

[Libreoffice Gerrit user]

 android/Bootstrap/src/org/libreoffice/android/Bootstrap.java |   12 ---
 sal/android/lo-bootstrap.c   |   37 +--
 2 files changed, 6 insertions(+), 43 deletions(-)

New commits:
commit ae81246917f581a7a498a371b9a6137cde542b3e
Author: Tor Lillqvist 
Date:   Wed Nov 21 15:18:30 2012 +0200

We don't need the library search path anymore

As we don't use any dlopen() etc wrappers now with just one single
DSO, we have no use for the library search path either.

Change-Id: Ifaf11c4785a90fe5c7dafb3310bc7933ea31238c

diff --git a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java 
b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
index 7b01eb8..3db5844 100644
--- a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
+++ b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
@@ -60,8 +60,7 @@ public class Bootstrap extends NativeActivity
 
 private static native boolean setup(String dataDir,
 String cacheDir,
-String apkFile,
-String[] ld_library_path);
+String apkFile);
 
 public static native boolean setup(Object lo_main_argument,
int lo_main_delay);
@@ -128,16 +127,9 @@ public class Bootstrap extends NativeActivity
 
 redirect_stdio(true);
 
-String llp = System.getenv("LD_LIBRARY_PATH");
-if (llp == null)
-llp = "/vendor/lib:/system/lib";
-
-String[] llpa = llp.split(":");
-
 if (!setup(dataDir,
activity.getApplication().getCacheDir().getAbsolutePath(),
-   activity.getApplication().getPackageResourcePath(),
-   llpa))
+   activity.getApplication().getPackageResourcePath()))
 return;
 
 // Extract files from the .apk that can't be used mmapped directly 
from it
diff --git a/sal/android/lo-bootstrap.c b/sal/android/lo-bootstrap.c
index f1f2155..6605748 100644
--- a/sal/android/lo-bootstrap.c
+++ b/sal/android/lo-bootstrap.c
@@ -84,7 +84,6 @@ static int sleep_time = 0;
 /* These are valid / used in all apps. */
 static const char *data_dir;
 static const char *cache_dir;
-static const char **library_locations;
 static void *apk_file;
 static int apk_file_size;
 static JavaVM *the_java_vm;
@@ -315,59 +314,31 @@ JNI_OnLoad(JavaVM* vm, void* reserved)
 
 // public static native boolean setup(String dataDir,
 //String cacheDir,
-//String apkFile,
-//String[] ld_library_path);
+//String apkFile)
 
 __attribute__ ((visibility("default")))
 jboolean
-Java_org_libreoffice_android_Bootstrap_setup__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2_3Ljava_lang_String_2
+Java_org_libreoffice_android_Bootstrap_setup__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2
 (JNIEnv* env,
  jobject clazz,
  jstring dataDir,
  jstring cacheDir,
- jstring apkFile,
- jobjectArray ld_library_path)
+ jstring apkFile)
 {
 struct stat st;
-int i, n, fd;
+int fd;
 const char *dataDirPath;
 const char *cacheDirPath;
 const char *apkFilePath;
-char *lib_dir;
 
 (void) clazz;
 
-n = (*env)->GetArrayLength(env, ld_library_path);
-
-library_locations = malloc((n+2) * sizeof(char *));
-
 dataDirPath = (*env)->GetStringUTFChars(env, dataDir, NULL);
-
 data_dir = strdup(dataDirPath);
-
-lib_dir = malloc(strlen(dataDirPath) + 5);
-strcpy(lib_dir, dataDirPath);
-strcat(lib_dir, "/lib");
-
 (*env)->ReleaseStringUTFChars(env, dataDir, dataDirPath);
 
-library_locations[0] = lib_dir;
-
-for (i = 0; i < n; i++) {
-const char *s = (*env)->GetStringUTFChars(env, 
(*env)->GetObjectArrayElement(env, ld_library_path, i), NULL);
-library_locations[i+1] = strdup(s);
-(*env)->ReleaseStringUTFChars(env, (*env)->GetObjectArrayElement(env, 
ld_library_path, i), s);
-}
-
-library_locations[n+1] = NULL;
-
-for (n = 0; library_locations[n] != NULL; n++)
-LOGI("library_locations[%d] = %s", n, library_locations[n]);
-
 cacheDirPath = (*env)->GetStringUTFChars(env, cacheDir, NULL);
-
 cache_dir = strdup(cacheDirPath);
-
 (*env)->ReleaseStringUTFChars(env, cacheDir, cacheDirPath);
 
 apkFilePath =  (*env)->GetStringUTFChars(env, apkFile, NULL);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - src/docrecord.py src/docstream.py

[Miklos Vajna]

 src/docrecord.py |   99 +++
 src/docstream.py |   16 +++-
 2 files changed, 113 insertions(+), 2 deletions(-)

New commits:
commit c5eb2a70373ec6400dfc6314c6bf7bafbe1f97de
Author: Miklos Vajna 
Date:   Wed Nov 21 14:34:51 2012 +0100

dump PlcfBkl

diff --git a/src/docrecord.py b/src/docrecord.py
index 7a01627..cecdef4 100755
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -101,7 +101,7 @@ class FBKF(DOCDirStream):
 self.pos += 2
 print ''
 
-class PlcfAtnBkf(DOCDirStream, PLC):
+class PlcfBkf(DOCDirStream, PLC):
 """A PLCFBKF is a PLC whose data elements are FBKF structures."""
 def __init__(self, mainStream, offset, size):
 DOCDirStream.__init__(self, 
mainStream.doc.getDirectoryStreamByName("1Table").bytes, mainStream = 
mainStream)
@@ -110,7 +110,7 @@ class PlcfAtnBkf(DOCDirStream, PLC):
 self.size = size
 
 def dump(self):
-print '' % 
(self.pos, self.size)
+print '' % 
(self.pos, self.size)
 offset = self.mainStream.fcMin
 pos = self.pos
 for i in range(self.getElements()):
@@ -124,7 +124,53 @@ class PlcfAtnBkf(DOCDirStream, PLC):
 aFBKF = FBKF(self, self.getOffset(self.pos, i))
 aFBKF.dump()
 print ''
-print ''
+print ''
+
+class PlcfBkf(DOCDirStream, PLC):
+"""A PLCFBKF is a PLC whose data elements are FBKF structures."""
+def __init__(self, mainStream, offset, size):
+DOCDirStream.__init__(self, 
mainStream.doc.getDirectoryStreamByName("1Table").bytes, mainStream = 
mainStream)
+PLC.__init__(self, size, 4) # 4 is defined by 2.8.10
+self.pos = offset
+self.size = size
+
+def dump(self):
+print '' % 
(self.pos, self.size)
+offset = self.mainStream.fcMin
+pos = self.pos
+for i in range(self.getElements()):
+# aCp
+start = offset + self.getuInt32(pos = pos)
+print '' % (i, start)
+print '' % 
FcCompressed.getFCTransformedValue(self.mainStream.bytes, start, start + 1)
+pos += 4
+
+# aFBKF
+aFBKF = FBKF(self, self.getOffset(self.pos, i))
+aFBKF.dump()
+print ''
+print ''
+
+class PlcfBkl(DOCDirStream, PLC):
+"""The Plcfbkl structure is a PLC that contains only CPs and no additional 
data."""
+def __init__(self, mainStream, offset, size):
+DOCDirStream.__init__(self, 
mainStream.doc.getDirectoryStreamByName("1Table").bytes, mainStream = 
mainStream)
+PLC.__init__(self, size, 0) # 0 is defined by 2.8.12
+self.pos = offset
+self.size = size
+
+def dump(self):
+print '' % 
(self.pos, self.size)
+offset = self.mainStream.fcMin
+pos = self.pos
+for i in range(self.getElements()):
+# aCp
+end = offset + self.getuInt32(pos = pos)
+print '' % (i, end)
+print '' % 
FcCompressed.getFCTransformedValue(self.mainStream.bytes, end, end + 1)
+pos += 4
+print ''
+print ''
 
 class PlcPcd(DOCDirStream, PLC):
 """The PlcPcd structure is a PLC whose data elements are Pcds (8 bytes 
each)."""
diff --git a/src/docstream.py b/src/docstream.py
index 98cc8e2..d9a539d 100755
--- a/src/docstream.py
+++ b/src/docstream.py
@@ -275,7 +275,7 @@ class WordDocumentStream(DOCDirStream):
 ["fcPlcfAtnBkf"],
 ["lcbPlcfAtnBkf", self.handleLcbPlcfAtnBkf],
 ["fcPlcfAtnBkl"],
-["lcbPlcfAtnBkl"],
+["lcbPlcfAtnBkl", self.handleLcbPlcfAtnBkl],
 ["fcPms"],
 ["lcbPms"],
 ["fcFormFldSttbs"],
@@ -433,8 +433,14 @@ class WordDocumentStream(DOCDirStream):
 def handleLcbPlcfAtnBkf(self):
 offset = self.fcPlcfAtnBkf
 size = self.lcbPlcfAtnBkf
-plcfAtnBkf = docrecord.PlcfAtnBkf(self, offset, size)
-plcfAtnBkf.dump()
+plcfBkf = docrecord.PlcfBkf(self, offset, size)
+plcfBkf.dump()
+
+def handleLcbPlcfAtnBkl(self):
+offset = self.fcPlcfAtnBkl
+size = self.lcbPlcfAtnBkl
+plcfBkl = docrecord.PlcfBkl(self, offset, size)
+plcfBkl.dump()
 
 def dumpFibRgFcLcb97(self, name):
 print '<%s type="FibRgFcLcb97" size="744 bytes">' % name
commit 74d77409cdcbd7f96325efffeea774c42c89e11b
Author: Miklos Vajna 
Date:   Wed Nov 21 14:22:17 2012 +0100

dump PlcfAtnBkf

diff --git a/src/docrecord.py b/src/docrecord.py
index 7378068..7a01627 100755
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -73,6 +73,59 @@ class PLC:
 def getPLCOffset(pos, elements, structSize, i):
 return pos + (4 * (elements + 1)) + (structSize * i)
 
+class BKC(DOCDirStream):
+"""The BKC structure contains information about how a bookmark interacts 
with tables."""
+def __init__(self, bkc):
+self.bkc = bkc
+
+def dump(self):
+pri

[Libreoffice-commits] .: src/docrecord.py

[Miklos Vajna]

 src/docrecord.py |6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 142d3ff44df29192112890035bdc6ec92f66
Author: Miklos Vajna 
Date:   Wed Nov 21 14:39:42 2012 +0100

FcCompressed: don't try to pretty-print

diff --git a/src/docrecord.py b/src/docrecord.py
index cecdef4..4b4c57a 100755
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -31,11 +31,7 @@ class FcCompressed(DOCDirStream):
 
 @staticmethod
 def getFCTransformedValue(bytes, start, end):
-# This is a bit ugly, but at this state we don't know yet if the text 
is compressed or not.
-try:
-return globals.encodeName(bytes[start:end].decode('utf-16'), 
lowOnly = True)
-except UnicodeDecodeError:
-return globals.encodeName(bytes[start:end])
+return globals.encodeName(bytes[start:end])
 
 class Pcd(DOCDirStream):
 """The Pcd structure specifies the location of text in the WordDocument 
Stream and additional properties for this text."""
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/uiconfig sw/uiconfig

[Libreoffice Gerrit user]

 cui/uiconfig/ui/insertoleobject.ui|   18 +--
 cui/uiconfig/ui/insertrowcolumn.ui|   14 +--
 cui/uiconfig/ui/zoomdialog.ui |   26 +-
 sw/uiconfig/swriter/ui/sortdialog.ui  |   40 +-
 sw/uiconfig/swriter/ui/splittable.ui  |   18 +--
 sw/uiconfig/swriter/ui/stringinput.ui |8 +-
 sw/uiconfig/swriter/ui/titlepage.ui   |   23 ++-
 sw/uiconfig/swriter/ui/wordcount.ui   |4 ---
 8 files changed, 15 insertions(+), 136 deletions(-)

New commits:
commit cf5603c440b1c3114e5867928a71e3b65b132793
Author: Alexander Wilms 
Date:   Sat Nov 17 05:40:09 2012 +0100

Moved buttons for consistency and improved widget spacing

Change-Id: Ia4faf04589503b1f299b3b53770f82b5d19fcd25

diff --git a/cui/uiconfig/ui/insertoleobject.ui 
b/cui/uiconfig/ui/insertoleobject.ui
index e823476..dc5debd 100644
--- a/cui/uiconfig/ui/insertoleobject.ui
+++ b/cui/uiconfig/ui/insertoleobject.ui
@@ -9,6 +9,7 @@
 
   
 False
+vertical
 2
 
   
@@ -24,11 +25,9 @@
 
   
 Create 
new
-False
 True
 True
 False
-False
 0
 True
 createfromfile
@@ -42,11 +41,9 @@
 
   
 Create from 
file
-False
 True
 True
 False
-False
 0
 True
 True
@@ -135,12 +132,10 @@
 
   
 Search 
...
-False
 True
 True
 True
 end
-False
   
   
 1
@@ -152,11 +147,9 @@
 
   
 Link to 
file
-False
 True
 True
 False
-False
 0
 True
   
@@ -199,18 +192,15 @@
 
   
 False
-vertical
-start
+end
 
   
 gtk-ok
-False
 True
 True
 True
 True
 True
-False
 True
   
   
@@ -222,11 +212,9 @@
 
   
 gtk-cancel
-False
 True
 True
 True
-False
 True
   
   
@@ -238,11 +226,9 @@
 
   
 gtk-help
-False
 True
 True
 True
-False
 True
   
   
diff --git a/cui/uiconfig/ui/insertrowcolumn.ui 
b/cui/uiconfig/ui/insertrowcolumn.ui
index c3b4d6f..f89ecc3 100644
--- a/cui/uiconfig/ui/insertrowcolumn.ui
+++ b/cui/uiconfig/ui/insertrowcolumn.ui
@@ -16,22 +16,20 @@
 
   
 False
+vertical
 2
 
   
 False
-vertical
-start
+end
 
   
 gtk-ok
-False
 True
 True
 True
 True
 True
-False
 True
   
   
@@ -43,11 +41,9 @@
 
   
 gtk-cancel
-False
 True
 True
 True
-False
 True
   
   
@@ -59,11 +55,9 @@
 
   
 gtk-help
-False
 True
 True
 True
-False
 True
   
   
@@ -175,11 +169,9 @@
 
   
 _Before
-False
 True
 True
 False
-False
 True
 0
 True
@@ -195,11 +187,9 @@
 
   
 A_fter
-  

[PUSHED] Moved buttons for consistency and improved widget spacing

[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/1094


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia4faf04589503b1f299b3b53770f82b5d19fcd25
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Alexander Wilms 
Gerrit-Reviewer: Alexander Wilms 
Gerrit-Reviewer: Caolán McNamara 

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

[Libreoffice-commits] .: vcl/source

[Libreoffice Gerrit user]

 vcl/source/window/layout.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a0a5eed63b871e2febb36e27e9dea4b7e57f681b
Author: Ivan Timofeev 
Date:   Tue Nov 20 16:37:44 2012 +0400

VclContainer: use transparent background

see 
http://lists.freedesktop.org/archives/libreoffice/2012-November/040587.html,
screenshot at [3].

Change-Id: Iaf72b3734564301244365773f05c6df01a6dea62
Reviewed-on: https://gerrit.libreoffice.org/1143
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index a8ebca9..a9aaf4c 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -16,6 +16,7 @@ VclContainer::VclContainer(Window *pParent)
 , m_bLayoutDirty(true)
 {
 ImplInit(pParent, WB_HIDE, NULL);
+SetBackground();
 }
 
 Size VclContainer::GetOptimalSize(WindowSizeType eType) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] VclContainer: use transparent background

[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/1143

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf72b3734564301244365773f05c6df01a6dea62
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ivan Timofeev 
Gerrit-Reviewer: Caolán McNamara 

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

[Libreoffice-commits] .: doc-dump.py src/docdirstream.py src/docrecord.py src/docsprm.py src/docstream.py

[Miklos Vajna]

 doc-dump.py |5 +
 src/docdirstream.py |5 +
 src/docrecord.py|5 +
 src/docsprm.py  |5 +
 src/docstream.py|5 +
 5 files changed, 25 insertions(+)

New commits:
commit ffaa0f304c05b9e1d342a3595dba5d9e614ba91a
Author: Miklos Vajna 
Date:   Wed Nov 21 14:56:42 2012 +0100

add MPL 2.0 license header for the doc bits

diff --git a/doc-dump.py b/doc-dump.py
index 28e7bcb..03760b2 100755
--- a/doc-dump.py
+++ b/doc-dump.py
@@ -1,4 +1,9 @@
 #!/usr/bin/env python
+#
+# 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/.
+#
 
 import sys
 sys = reload(sys)
diff --git a/src/docdirstream.py b/src/docdirstream.py
index c488904..04c1c31 100755
--- a/src/docdirstream.py
+++ b/src/docdirstream.py
@@ -1,4 +1,9 @@
 #!/usr/bin/env python
+#
+# 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/.
+#
 
 import globals
 import struct
diff --git a/src/docrecord.py b/src/docrecord.py
index 4b4c57a..d3fdbd6 100755
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -1,4 +1,9 @@
 #!/usr/bin/env python
+#
+# 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/.
+#
 
 import struct
 import globals
diff --git a/src/docsprm.py b/src/docsprm.py
index 54c9798..4108809 100755
--- a/src/docsprm.py
+++ b/src/docsprm.py
@@ -1,4 +1,9 @@
 #!/usr/bin/env python
+#
+# 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/.
+#
 
 # see 2.6.3 of the spec
 tblMap = {
diff --git a/src/docstream.py b/src/docstream.py
index d9a539d..94ed4ba 100755
--- a/src/docstream.py
+++ b/src/docstream.py
@@ -1,4 +1,9 @@
 #!/usr/bin/env python
+#
+# 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/.
+#
 
 import ole
 import struct
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [REVIEW 3-6] fdo#56548, also remove comment caption objects when deleting comments

[Kohei Yoshida]

Hi Markus,

On 11/21/2012 06:00 AM, Markus Mohrhard wrote:

Hey,

[1] fixes that comment captions are not deleted with the comment. I
checked that undo/redo are memcheck clean as the note caption object
lifetime is not simple.

Regards,
Markus

[1] 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=f44928cbd51fc7d08e2b81dcdf837650cd215847


The bug you reference

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

doesn't seem related to the bug that this commit fixes... Perhaps a typo?

Kohei

--
Kohei Yoshida, LibreOffice hacker, Calc
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: configure.ac

[Libreoffice Gerrit user]

 configure.ac |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 93abcf4e4bb1a460d7695b6374bf4a92c9203512
Author: Matúš Kukan 
Date:   Wed Nov 21 14:55:58 2012 +0100

get ICU_DATA_SUBSET_ZIP into ooo.lst when cross-compiling

Change-Id: I73ef1e331f3cec8e2769b177ec1767cf35fcb817

diff --git a/configure.ac b/configure.ac
index 347f43b..b09d2c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12506,9 +12506,13 @@ fi
 
 AC_SUBST(LO_PATH)
 
-# We need at least berkeleydb for build platform in ooo.lst
+BUILD_TARBALLS=
+# Ugly hack to get what we need for build platform into ooo.lst
 if test "$CROSS_COMPILING" = "YES" ; then
-
BUILD_TARBALLS="d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz"
+# BERKELEYDB_TARBALL
+BUILD_TARBALLS="$BUILD_TARBALLS 
d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz" 
+# ICU_DATA_SUBSET_ZIP
+BUILD_TARBALLS="$BUILD_TARBALLS 
fc188d2ed5c2cbcf7a021b34b9f88478-icudt49l-subset.zip"
 fi
 AC_SUBST(BUILD_TARBALLS)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Tinderbox failure, Win-x86@7-MinGW, MASTER, last success: 2012-11-20 19:54:45

[Matúš Kukan]

On 21 November 2012 14:04, Lubos Lunak  wrote:
> On Wednesday 21 of November 2012, ke...@suse.cz wrote:
>> Hi folks,
>>
>> One of you broke the build of LibreOffice with your commit :-(
>> Please commit and push a fix ASAP!
>>
>> Full log available at http://tinderbox.libreoffice.org/MASTER/status.html
>>
>> Tinderbox info:
>>
>>   Box name: Win-x86@7-MinGW
> ...
>> unzip:  cannot find or open
>> /local/home/tinderbox/master-mingw/src/fc188d2ed5c2cbcf7a021b34b9f88478-icu
>>dt49l-subset.zip,
>> /local/home/tinderbox/master-mingw/src/fc188d2ed5c2cbcf7a021b34b9f88478-icu
>>dt49l-subset.zip.zip or
>> /local/home/tinderbox/master-mingw/src/fc188d2ed5c2cbcf7a021b34b9f88478-icu
>>dt49l-subset.zip.ZIP. dmake:  Error code 9, while making
>> './unxlngx6.pro/misc/build/so_configured_so_icu' ERROR: error 65280
>> occurred while making /local/home/tinderbox/master-mingw/icu
>
>  It seems specifying tarballs to download in configure.ac doesn't work well
> with cross-compilation.

True, currently it's quite ugly.
http://cgit.freedesktop.org/libreoffice/core/commit/?id=93abcf4e4bb1a460d7695b6374bf4a92c9203512
should fix this.
Maybe selective download was not that good idea.
I'm working on moving ooo.lst into makefile.
That also may be not good idea. Let's see.
It could help this cross-compiling hack.

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

[Libreoffice-commits] .: instsetoo_native/util solenv/bin solenv/inc

[Libreoffice Gerrit user]

 instsetoo_native/util/makefile.mk |2 +-
 solenv/bin/ooinstall  |2 +-
 solenv/inc/langlist.mk|1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 7e8cc51f61cc712252d20be8c0735a58190036ac
Author: Andras Timar 
Date:   Wed Nov 21 14:58:42 2012 +0100

remove qtz temporarily, until it works again reliably

Change-Id: I66b117a56d8d545e6d09bfacb897ade383818895

diff --git a/instsetoo_native/util/makefile.mk 
b/instsetoo_native/util/makefile.mk
index 8b3171c..7d79e29 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -76,7 +76,7 @@ OOOHELPPACK=ooohelppack
 OOODEVHELPPACK=ooodevhelppack
 .ENDIF
 
-help_exist:=$(shell @find $(L10N_MODULE)/source/ -type d -name "helpcontent2" 
2>/dev/null | sed -e "s|/helpcontent2||" -e "s|^.*/||" ) en-US qtz
+help_exist:=$(shell @find $(L10N_MODULE)/source/ -type d -name "helpcontent2" 
2>/dev/null | sed -e "s|/helpcontent2||" -e "s|^.*/||" ) en-US
 
 # do not build key is pseudolanguage for release builds
 .IF "$(ENABLE_RELEASE_BUILD)"=="TRUE"
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index b83804d..a4ce6ce 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -98,7 +98,7 @@ if ($langs eq 'ALL') {
 @larr = readdir(DIR);
 @larr = grep { $_ ne '.' } @larr;
 @larr = grep { $_ ne '..' } @larr;
-@larr = (@larr,"en-US","qtz");
+@larr = (@larr,"en-US");
 closedir(DIR);
 }
 else {
diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk
index 5ba2dc8..3f81446 100644
--- a/solenv/inc/langlist.mk
+++ b/solenv/inc/langlist.mk
@@ -102,7 +102,6 @@ pa-IN \
 pl \
 pt \
 pt-BR \
-qtz \
 ro \
 ru \
 rw \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [REVIEW 3-6] fdo#56548, also remove comment caption objects when deleting comments

[Markus Mohrhard]

Hey Kohei,

>>
>> [1] fixes that comment captions are not deleted with the comment. I
>> checked that undo/redo are memcheck clean as the note caption object
>> lifetime is not simple.
>>
>> Regards,
>> Markus
>>
>> [1]
>> http://cgit.freedesktop.org/libreoffice/core/commit/?id=f44928cbd51fc7d08e2b81dcdf837650cd215847
>
>
> The bug you reference
>
> https://bugs.freedesktop.org/show_bug.cgi?id=56548
>
> doesn't seem related to the bug that this commit fixes... Perhaps a typo?
>


Yeap sorry, should have been fdo#56584.

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

[Libreoffice-commits] .: helpcontent2 l10ntools/scripts

[Libreoffice Gerrit user]

 helpcontent2  |2 
 l10ntools/scripts/addkeyid2pot.pl |  106 
 l10ntools/scripts/fast_merge.pl   |  331 --
 l10ntools/scripts/keyidGen.pl |  144 
 4 files changed, 1 insertion(+), 582 deletions(-)

New commits:
commit 4a51910761b1f528cc21a4d0cc7035108d46aa63
Author: Andras Timar 
Date:   Wed Nov 21 15:08:41 2012 +0100

remove 3 unused Perl scripts from l10ntools

Change-Id: Ie2e8fa776b5a7a7293498607fe55dcdfce273594

diff --git a/helpcontent2 b/helpcontent2
index bfe8b1e..66abeb1 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit bfe8b1eea5e372ff7198d841caa20c72a57610e0
+Subproject commit 66abeb18556b468ea3d97cea78dcd8e9f0c94380
diff --git a/l10ntools/scripts/addkeyid2pot.pl 
b/l10ntools/scripts/addkeyid2pot.pl
deleted file mode 100644
index bd66a3b..000
--- a/l10ntools/scripts/addkeyid2pot.pl
+++ /dev/null
@@ -1,106 +0,0 @@
-:
-eval 'exec perl -S $0 ${1+"$@"}'
-if 0;
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#   Andras Timar 
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-# add keyids to pot files
-#
-
-use File::Find;
-
-sub keyidgen
-{
-my $key = shift;
-my $crc = crc24($key);
-my 
$symbols="0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz#_";
-my $keyid = "";
-while ( length($keyid) < 4 )
-{
-$keyid .= substr($symbols, $crc & 63, 1);
-$crc = $crc >> 6;
-}
-return $keyid;
-}
-
-sub crc24
-{
-my $CRC24_INIT = 0x00b704ce;
-my $CRC24_POLY = 0x00864cfb;
-my $key = shift;
-my $key_length = length($key);
-my $crc = $CRC24_INIT;
-my $position = 0;
-
-while ( $position < $key_length )
-{
-$crc ^= (unpack("C", substr($key, $position, 1)) << 16);
-my $i;
-for ($i = 0; $i < 8; $i++)
-{
-$crc <<= 1;
-$crc ^= $CRC24_POLY if ($crc & 0x0100)
-}
-$position++;
-}
-return $crc & 0x00ff;
-}
-
-my $potdir = $ARGV[0];
-
-if (!$potdir) {die "Usage_ $0 \n";}
-
-my @potfiles = ();
-
-File::Find::find( sub {/^.*\.pot\z/s && push @potfiles, $File::Find::name;}, 
$potdir );
-
-foreach $f (@potfiles)
-{
-open OLDPOT , "< $f" || die("Cannot open source pot file: $f\n");
-$fnew = $f . ".new";
-@path = split ("/",$f);
-$keypart1 = pop @path;
-$keypart1 =~ s/.pot//;
-$keypart1 .= "_";
-$keypart2 = pop @path;
-$keypart1 = $keypart2 . "_" . $keypart1;
-open NEWPOT , "> $fnew" || die("Cannot open target pot file: $f\n");
-while (  )
-{
-chomp;
-if( /^#: (.*)$/ )
-{
-print NEWPOT "#. " . keyidgen($keypart1 . $1) . "\n";
-}
-print NEWPOT $_ . "\n";
-}
-close OLDPOT;
-close NEWPOT;
-rename $fnew,$f;
-}
-
-exit 0;
diff --git a/l10ntools/scripts/fast_merge.pl b/l10ntools/scripts/fast_merge.pl
deleted file mode 100644
index bd20487..000
--- a/l10ntools/scripts/fast_merge.pl
+++ /dev/null
@@ -1,331 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
-if 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 .
-#
-
-use strict;
-us

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

[Libreoffice Gerrit user]

 svgio/inc/svgio/svgreader/svgdocument.hxx|1 -
 svgio/inc/svgio/svgreader/svgstyleattributes.hxx |1 -
 svgio/source/svgreader/svgdocument.cxx   |8 
 svgio/source/svgreader/svgstyleattributes.cxx|   13 -
 svgio/source/svgreader/svgtextpathnode.cxx   |   15 ---
 svtools/inc/svtools/treelist.hxx |1 -
 svtools/source/contnr/treelist.cxx   |5 -
 unusedcode.easy  |4 
 8 files changed, 48 deletions(-)

New commits:
commit 42925ee1fd33bcbcf8359404d4abf687acc79315
Author: Enrico Weigelt, metux ITS 
Date:   Thu Nov 15 13:33:56 2012 +0100

dropped dead code from svg

Change-Id: I73244d54f182f44c08a942dee95ff11b53a24f5a
Reviewed-on: https://gerrit.libreoffice.org/1078
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svgio/inc/svgio/svgreader/svgdocument.hxx 
b/svgio/inc/svgio/svgreader/svgdocument.hxx
index ae30fe4..b8d29ac 100644
--- a/svgio/inc/svgio/svgreader/svgdocument.hxx
+++ b/svgio/inc/svgio/svgreader/svgdocument.hxx
@@ -68,7 +68,6 @@ namespace svgio
 
 /// add/remove styles to mapper
 void addSvgStyleAttributesToMapper(const rtl::OUString& rStr, 
const SvgStyleAttributes& rSvgStyleAttributes);
-void removeSvgStyleAttributesFromMapper(const rtl::OUString& rStr);
 
 /// find a style by it's Id
 bool hasSvgStyleAttributesById() const { return 
!maIdStyleTokenMapperList.empty(); }
diff --git a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx 
b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
index 6678958..042fa66 100644
--- a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
+++ b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
@@ -304,7 +304,6 @@ namespace svgio
 
 /// fill rule content
 bool getFillRule() const;
-void setFillRule(const bool* pFillRule = 0);
 
 /// fill StrokeDasharray content
 const SvgNumberVector& getStrokeDasharray() const;
diff --git a/svgio/source/svgreader/svgdocument.cxx 
b/svgio/source/svgreader/svgdocument.cxx
index e5dd4ac..d8c379d 100644
--- a/svgio/source/svgreader/svgdocument.cxx
+++ b/svgio/source/svgreader/svgdocument.cxx
@@ -87,14 +87,6 @@ namespace svgio
 }
 }
 
-void SvgDocument::removeSvgStyleAttributesFromMapper(const 
rtl::OUString& rStr)
-{
-if(rStr.getLength())
-{
-maIdStyleTokenMapperList.erase(rStr);
-}
-}
-
 const SvgStyleAttributes* 
SvgDocument::findSvgStyleAttributesById(const rtl::OUString& rStr) const
 {
 const IdStyleTokenMapper::const_iterator 
aResult(maIdStyleTokenMapperList.find(rStr));
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx 
b/svgio/source/svgreader/svgstyleattributes.cxx
index 1a2755e..07845df 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -2049,19 +2049,6 @@ namespace svgio
 return true;
 }
 
-void SvgStyleAttributes::setFillRule(const bool* pFillRule)
-{
-if(pFillRule)
-{
-maFillRuleSet = true;
-maFillRule = *pFillRule;
-}
-else
-{
-maFillRuleSet = false;
-}
-}
-
 const SvgNumberVector& SvgStyleAttributes::getStrokeDasharray() const
 {
 if(!maStrokeDasharray.empty())
diff --git a/svgio/source/svgreader/svgtextpathnode.cxx 
b/svgio/source/svgreader/svgtextpathnode.cxx
index ba7de86..c06b6b7 100644
--- a/svgio/source/svgreader/svgtextpathnode.cxx
+++ b/svgio/source/svgreader/svgtextpathnode.cxx
@@ -72,23 +72,8 @@ namespace svgio
 
 // read access to evtl. advanced position
 double getPosition() const { return mfPosition; }
-
-// get length of given text
-double getLength(const rtl::OUString& rText) const;
 };
 
-double pathTextBreakupHelper::getLength(const rtl::OUString& rText) 
const
-{
-const sal_uInt32 nLength(rText.getLength());
-
-if(nLength)
-{
-return getTextLayouter().getTextWidth(rText, 0, nLength);
-}
-
-return 0.0;
-}
-
 void pathTextBreakupHelper::freeB2DCubicBezierHelper()
 {
 if(mpB2DCubicBezierHelper)
diff --git a/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx
index 96c78bb..9886207 100644
--- a/svtools/inc/svtools/treelist.hxx
+++ b/svtools/inc/svtools/treelist.hxx
@@ -324,7 +324,6 @@ public:
 SvListView();   // Sets the Model to 0
 virtual ~SvListView();
 voidClear();
-SvTreeList* GetModel() const;
 virtual voidSetModel( SvTreeList* );
 virtual

[Libreoffice-commits] .: liblangtag/liblangtag-0.4.0-ppc.patch liblangtag/UnpackedTarball_langtag.mk

[Libreoffice Gerrit user]

 liblangtag/UnpackedTarball_langtag.mk |1 +
 liblangtag/liblangtag-0.4.0-ppc.patch |   10 ++
 2 files changed, 11 insertions(+)

New commits:
commit 76a28511a0703be60168c8d1a6d9d288e7414fad
Author: Caolán McNamara 
Date:   Wed Nov 21 14:10:41 2012 +

fix build on ppc

Change-Id: I4b09aa9eeb2c34d19043148144383ad4e37a8d10

diff --git a/liblangtag/UnpackedTarball_langtag.mk 
b/liblangtag/UnpackedTarball_langtag.mk
index 1deea13..f8adaa8 100644
--- a/liblangtag/UnpackedTarball_langtag.mk
+++ b/liblangtag/UnpackedTarball_langtag.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,langtag,\
liblangtag/liblangtag-0.4.0-reg2xml-encoding-problem.patch \
liblangtag/liblangtag-0.4.0-windows2.patch \
liblangtag/liblangtag-0.4.0-msvcprojects.patch \
+   liblangtag/liblangtag-0.4.0-ppc.patch \
 ))
 endif
 
diff --git a/liblangtag/liblangtag-0.4.0-ppc.patch 
b/liblangtag/liblangtag-0.4.0-ppc.patch
new file mode 100644
index 000..c8e9e74
--- /dev/null
+++ b/liblangtag/liblangtag-0.4.0-ppc.patch
@@ -0,0 +1,10 @@
+--- misc/liblangtag-0.4.0/liblangtag/lt-macros.h
 misc/build/liblangtag-0.4.0/liblangtag/lt-macros.h
+@@ -203,6 +203,7 @@
+   LT_STMT_START {__asm__ __volatile__ ("bpt");} LT_STMT_END
+ #else
++#  include 
+ #  define LT_BREAKPOINT() \
+   LT_STMT_START {raise(SIGTRAP);} LT_STMT_END
+ #endif
+ 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [REVIEW 3-6] fdo#56548, also remove comment caption objects when deleting comments

[Kohei Yoshida]

On 11/21/2012 09:08 AM, Markus Mohrhard wrote:


Yeap sorry, should have been fdo#56584.


Thanks! And here is the URL for those who wish to review

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

BTW, it would be helpful if you post the URL instead of just the bug 
number.  That helps us quite a few clicks and key strokes to get to the 
bug report, thereby making the review process bit more speedier. ;-)


Thanks,

Kohei

--
Kohei Yoshida, LibreOffice hacker, Calc
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: l10ntools/Package_scripts.mk

[Libreoffice Gerrit user]

 l10ntools/Package_scripts.mk |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 7119a76da2f35fbfae65d3b71caec08d64700714
Author: Caolán McNamara 
Date:   Wed Nov 21 14:13:57 2012 +

remove from Packages_scripts the removed scripts

since 4a51910761b1f528cc21a4d0cc7035108d46aa63

Change-Id: I17b670769da4ac1c91dabda2aa3d42c458c12135

diff --git a/l10ntools/Package_scripts.mk b/l10ntools/Package_scripts.mk
index d00d283..dc6d6c9 100644
--- a/l10ntools/Package_scripts.mk
+++ b/l10ntools/Package_scripts.mk
@@ -26,9 +26,6 @@
 
 $(eval $(call 
gb_Package_Package,l10ntools_scripts,$(SRCDIR)/l10ntools/scripts))
 
-$(eval $(call 
gb_Package_add_file,l10ntools_scripts,bin/addkeyid2pot.pl,addkeyid2pot.pl))
-$(eval $(call 
gb_Package_add_file,l10ntools_scripts,bin/fast_merge.pl,fast_merge.pl))
-$(eval $(call 
gb_Package_add_file,l10ntools_scripts,bin/keyidGen.pl,keyidGen.pl))
 $(eval $(call gb_Package_add_file,l10ntools_scripts,bin/po2lo,po2lo))
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] dropped dead code from svg

[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/1078

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I73244d54f182f44c08a942dee95ff11b53a24f5a
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Enrico Weigelt, metux IT service 
Gerrit-Reviewer: Caolán McNamara 

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

[Libreoffice-commits] .: 3 commits - starmath/inc starmath/source vcl/unx

[Libreoffice Gerrit user]

 starmath/inc/parse.hxx   |2 
 starmath/source/cursor.cxx   |   16 +++---
 starmath/source/mathmlimport.cxx |   19 +++-
 starmath/source/node.cxx |6 +-
 starmath/source/parse.cxx|   92 +++
 starmath/source/view.cxx |2 
 vcl/unx/kde4/KDESalGraphics.cxx  |7 ++
 7 files changed, 73 insertions(+), 71 deletions(-)

New commits:
commit d5e8be8bab87b91710d3cec9039d2feff78b50ba
Author: Ivan Timofeev 
Date:   Wed Nov 21 18:13:18 2012 +0400

KDESalGraphics: fix CTRL_LISTNODE drawing in expanded state

Change-Id: Ia70f1b3e2afb459bf91748f9e4ba0a0cbde74260

diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index b6d26b4..fdd 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -457,7 +457,7 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType 
type, ControlPart part,
 QStyleOption option;
 option.state = QStyle::State_Item | QStyle::State_Children;
 
-if (nControlState & CTRL_STATE_PRESSED)
+if (value.getTristateVal() == BUTTONVALUE_ON)
 option.state |= QStyle::State_Open;
 
 draw( QStyle::PE_IndicatorBranch, &option, m_image,
commit dd2a12d5199c36950b1480a9aab96e07dc4afcd2
Author: Ivan Timofeev 
Date:   Wed Nov 21 11:46:25 2012 +0400

KDESalGraphics: transparent background for some widgets, fdo#55952

Change-Id: Iea8537b0d69efaa7323c739c614272f6525435dd

diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index e67de52..b6d26b4 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -288,6 +288,7 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType 
type, ControlPart part,
 
 if (type == CTRL_PUSHBUTTON)
 {
+m_image->fill( Qt::transparent );
 QStyleOptionButton option;
 draw( QStyle::CE_PushButton, &option, m_image,
   vclStateValue2StateFlag(nControlState, value) );
@@ -377,6 +378,7 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType 
type, ControlPart part,
 }
 else if ( (type == CTRL_TOOLBAR) && (part == PART_BUTTON) )
 {
+m_image->fill( Qt::transparent );
 QStyleOptionToolButton option;
 
 option.arrowType = Qt::NoArrow;
@@ -451,6 +453,7 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType 
type, ControlPart part,
 }
 else if (type == CTRL_LISTNODE)
 {
+m_image->fill( Qt::transparent );
 QStyleOption option;
 option.state = QStyle::State_Item | QStyle::State_Children;
 
@@ -462,6 +465,7 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType 
type, ControlPart part,
 }
 else if (type == CTRL_CHECKBOX)
 {
+m_image->fill( Qt::transparent );
 QStyleOptionButton option;
 draw( QStyle::CE_CheckBox, &option, m_image,
vclStateValue2StateFlag(nControlState, value) );
@@ -528,6 +532,7 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType 
type, ControlPart part,
 }
 else if (type == CTRL_RADIOBUTTON)
 {
+m_image->fill( Qt::transparent );
 QStyleOptionButton option;
 draw( QStyle::CE_RadioButton, &option, m_image,
   vclStateValue2StateFlag(nControlState, value) );
commit 45ccace028a4ad40fdbaffad050741db583259c9
Author: Ivan Timofeev 
Date:   Tue Nov 20 23:20:20 2012 +0400

String -> OUString

Change-Id: I23e0181c1aefc9efbac81216a18cdd7042a7679e

diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx
index e3a8d23..d5affc7 100644
--- a/starmath/inc/parse.hxx
+++ b/starmath/inc/parse.hxx
@@ -111,7 +111,7 @@ enum SmTokenType
 struct SmToken
 {
 
-String  aText;  // token text
+OUStringaText;  // token text
 SmTokenType eType;  // token info
 sal_Unicode cMathChar;
 
diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx
index 8ba0529..4c91b8a 100644
--- a/starmath/source/cursor.cxx
+++ b/starmath/source/cursor.cxx
@@ -1022,7 +1022,7 @@ void SmCursor::InsertElement(SmFormulaElement element){
 {
 SmToken token;
 token.nGroup = TGBLANK;
-token.aText.AssignAscii("~");
+token.aText = "~";
 pNewNode = new SmBlankNode(token);
 }break;
 case FactorialElement:
@@ -1037,7 +1037,7 @@ void SmCursor::InsertElement(SmFormulaElement element){
 token.cMathChar = MS_PLUS;
 token.nGroup = TGUNOPER | TGSUM;
 token.nLevel = 5;
-token.aText.AssignAscii("+");
+token.aText = "+";
 pNewNode = new SmMathSymbolNode(token);
 }break;
 case MinusElement:
@@ -1047,7 +1047,7 @@ void SmCursor::InsertElement(SmFormulaElement element){
 token.cMathChar = MS_MINUS;
 token.nGroup = TGUNOPER | TGSUM;
 token.nLevel = 5;
-token.aText.Assign

[Libreoffice-commits] .: android/experimental

[Libreoffice Gerrit user]

 android/experimental/LibreOffice4Android/Makefile |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 0f834124b11d9fe2485455937b8e668813914c69
Author: Tor Lillqvist 
Date:   Wed Nov 21 16:15:42 2012 +0200

udkapi.rdb could never be used anyway as it is not mentioned in any rc file?

Change-Id: I5897f3d7e8d3d16481c644ee688bcf001d1b7b8c

diff --git a/android/experimental/LibreOffice4Android/Makefile 
b/android/experimental/LibreOffice4Android/Makefile
index c48635c..bcea6e6 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -40,7 +40,6 @@ copy-stuff:
 # extent).
 #
mkdir -p assets/bin/ure assets/lib assets/program assets/xml/ure 
assets/ComponentTarget/i18npool/util
-   cp $(OUTDIR)/bin/udkapi.rdb assets/bin
cp $(OUTDIR)/bin/offapi.rdb assets/bin
cp $(OUTDIR)/bin/oovbaapi.rdb assets/bin
cp $(OUTDIR)/bin/types.rdb assets/bin
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Xlib import via generic pkg-config

[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/1099


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6ee381030ff9f1d2d83062a17ab55ad3d847a4c6
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Enrico Weigelt, metux IT service 
Gerrit-Reviewer: Caolán McNamara 
Gerrit-Reviewer: Enrico Weigelt, metux IT service 


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

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

[Libreoffice Gerrit user]

 sc/source/core/data/table2.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a7ad12f2832c519fcef243c591fcccdc170874c0
Author: Markus Mohrhard 
Date:   Sat Nov 17 18:46:14 2012 +0100

fdo#56584: delete also note caption.

Change-Id: I1d792082e79d6bb68004a84c172cc3bb5c194826
Signed-off-by: Kohei Yoshida 

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index bc97e9c..cb9ae98 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -566,7 +566,7 @@ void ScTable::DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL 
nCol2, SCROW nRow2, sal
 }
 
 if (nDelFlag & IDF_NOTE)
-maNotes.erase( nCol1, nRow1, nCol2, nRow2, true );
+maNotes.erase( nCol1, nRow1, nCol2, nRow2 );
 
 if (IsStreamValid())
 // TODO: In the future we may want to check if the table has been
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: GTK theming: oxygen-gtk support broken

[Ivan Timofeev]

Hi,

So, background gradients are fixed now with
http://cgit.freedesktop.org/libreoffice/core/commit/?id=a0a5eed63b871e2febb36e27e9dea4b7e57f681b

Regards,
Ivan

On 01.11.2012 23:48, Ruslan Kabatsayev wrote:
> Some time after my commits, which enabled almost fully correct
> oxygen-gtk support (latest commit was on Jul 8 2012), this support was
> broken. See screenshots at [1], [2], [3] and [4] for details.
[...]
> [1] Edit field and combo button sizes mismatch: http://i.imgur.com/lnvfS.png
> [2] Background gradient not rendered: http://i.imgur.com/lRPLY.png
> [3] Text line entry clips text to the left too much 
> http://i.imgur.com/sV10D.png
> [4] Menu expansion arrows are clipped at top: http://i.imgur.com/Gn67Z.png

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

Re: [REVIEW 3-6] [PUSEHD 3-6] fdo#56548, also remove comment caption objects when deleting comments

[Kohei Yoshida]

On 11/21/2012 09:15 AM, Kohei Yoshida wrote:

On 11/21/2012 09:08 AM, Markus Mohrhard wrote:


Yeap sorry, should have been fdo#56584.


The change indeed fixes the reported problem.  Pushed to 3-6 with my 
sign-off.


But I still see a similar issue when deleting a range of cells with 
notes shown.  Perhaps the same change is needed in that code path...


Kohei

--
Kohei Yoshida, LibreOffice hacker, Calc
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Tinderbox failure, Win-x86@7-MinGW, MASTER, last success: 2012-11-20 19:54:45

[Petr Mladek]

Matúš Kukan píše v St 21. 11. 2012 v 15:06 +0100:
> On 21 November 2012 14:04, Lubos Lunak  wrote:
> > On Wednesday 21 of November 2012, ke...@suse.cz wrote:
> >> Hi folks,
> >>
> >> One of you broke the build of LibreOffice with your commit :-(
> >> Please commit and push a fix ASAP!
> >>
> >> Full log available at http://tinderbox.libreoffice.org/MASTER/status.html
> >>
> >> Tinderbox info:
> >>
> >>   Box name: Win-x86@7-MinGW
> > ...
> >> unzip:  cannot find or open
> >> /local/home/tinderbox/master-mingw/src/fc188d2ed5c2cbcf7a021b34b9f88478-icu
> >>dt49l-subset.zip,
> >> /local/home/tinderbox/master-mingw/src/fc188d2ed5c2cbcf7a021b34b9f88478-icu
> >>dt49l-subset.zip.zip or
> >> /local/home/tinderbox/master-mingw/src/fc188d2ed5c2cbcf7a021b34b9f88478-icu
> >>dt49l-subset.zip.ZIP. dmake:  Error code 9, while making
> >> './unxlngx6.pro/misc/build/so_configured_so_icu' ERROR: error 65280
> >> occurred while making /local/home/tinderbox/master-mingw/icu
> >
> >  It seems specifying tarballs to download in configure.ac doesn't work well
> > with cross-compilation.
> 
> True, currently it's quite ugly.
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=93abcf4e4bb1a460d7695b6374bf4a92c9203512
> should fix this.
> Maybe selective download was not that good idea.
> I'm working on moving ooo.lst into makefile.
> That also may be not good idea. Let's see.
> It could help this cross-compiling hack.

Ah, this feature has been discussed at
https://bugs.freedesktop.org/show_bug.cgi?id=56131 David suggested to
use one variable for each tarball. Such variable can be reused also in
the makefile that is used during build. IMHO, it is a good idea.


Best Regards,
Petr

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

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

[Libreoffice Gerrit user]

 vcl/inc/vcl/builder.hxx   |2 +-
 vcl/source/window/builder.cxx |   21 -
 2 files changed, 17 insertions(+), 6 deletions(-)

New commits:
commit 19c54819a9d8f03788a97ecd4296093f72643069
Author: Caolán McNamara 
Date:   Wed Nov 21 14:52:32 2012 +

apply packing properties of pseudo-scrolledwindow to self-scrolling child

Change-Id: I13b0b625109237a0ec9711ed2efdc34cd3e0d32b

diff --git a/vcl/inc/vcl/builder.hxx b/vcl/inc/vcl/builder.hxx
index 796f33f..e350a81 100644
--- a/vcl/inc/vcl/builder.hxx
+++ b/vcl/inc/vcl/builder.hxx
@@ -125,7 +125,7 @@ private:
 std::vector m_aButtonImageWidgetMaps;
 StockMap m_aStockMap;
 Translations m_aTranslations;
-std::set m_aRedundantParentWidgets;
+std::map m_aRedundantParentWidgets;
 };
 
 void loadTranslations(const com::sun::star::lang::Locale &rLocale, const 
OUString &rUri);
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 76ee4ad..e2fcca6 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -224,10 +224,10 @@ VclBuilder::VclBuilder(Window *pParent, OUString sUIDir, 
OUString sUIFile, OStri
 
 //Remove ScrollWindow parent widgets whose children in vcl implement 
scrolling
 //internally.
-for (std::set::iterator aI = 
m_pParserState->m_aRedundantParentWidgets.begin(),
+for (std::map::iterator aI = 
m_pParserState->m_aRedundantParentWidgets.begin(),
 aEnd = m_pParserState->m_aRedundantParentWidgets.end(); aI != aEnd; 
++aI)
 {
-delete_by_window(*aI);
+delete_by_window(aI->first);
 }
 
 //drop maps, etc. that we don't need again
@@ -795,23 +795,28 @@ Window *VclBuilder::makeObject(Window *pParent, const 
OString &name, const OStri
 //so if it appears as a child of a scrolling window
 //shoehorn that scrolling settings to this
 //widget and remove the parent
+Window *pScrollParent = NULL;
 if (pParent && pParent->GetType() == WINDOW_SCROLLWINDOW)
 {
 WinBits nScrollBits = pParent->GetStyle();
 nScrollBits &= 
(WB_AUTOHSCROLL|WB_HSCROLL|WB_AUTOVSCROLL|WB_VSCROLL);
 nWinStyle |= nScrollBits;
 
-Window *pScrollParent = pParent;
+pScrollParent = pParent;
 pParent = pParent->GetParent();
+}
+
+pWindow = new VclMultiLineEdit(pParent, nWinStyle);
 
+if (pScrollParent)
+{
 sal_Int32 nWidthReq = pScrollParent->get_width_request();
 rMap[OString("width-request")] = OString::valueOf(nWidthReq);
 sal_Int32 nHeightReq = pScrollParent->get_height_request();
 rMap[OString("height-request")] = OString::valueOf(nHeightReq);
 
-m_pParserState->m_aRedundantParentWidgets.insert(pScrollParent);
+m_pParserState->m_aRedundantParentWidgets[pScrollParent] = pWindow;
 }
-pWindow = new VclMultiLineEdit(pParent, nWinStyle);
 }
 else
 {
@@ -1446,6 +1451,12 @@ void VclBuilder::applyPackingProperty(Window *pCurrent,
 xmlreader::Span name;
 int nsId;
 
+if (pCurrent->GetType() == WINDOW_SCROLLWINDOW)
+{
+pCurrent = m_pParserState->m_aRedundantParentWidgets[pCurrent];
+assert(pCurrent);
+}
+
 while (reader.nextAttribute(&nsId, &name))
 {
 if (name.equals(RTL_CONSTASCII_STRINGPARAM("name")))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Shared Mac build host (was: Re: Funding Wishlist)

[Norbert Thiebaud]

It would be best if TDF owned outright at least enough hardware to be
able to to a release on all supported platform..

so I do agree with Thorsten request ot acquire a MAc, but I would also
add the need for a TDF owned windows box.

In fact I thing we should have a pair of each. one that cna be 'lent'
to dev to allow them to debug/test things for bug that they cannot
reproduce on their own hardware
and one with much more restricted access to capable of building anf
signing release build the later can also double as release branch
tinderbox...

money wise... we would have to 'buy' the Mac box.. since I don't know
of any hosting provider that rent these... but the windows one can be
'rented' in a hosting facilities.
What make financial sens is left to infra + BoD to decide.

Norbert

PS: the Mac do not need 10.4 SDK.. by the time they are online we will
have moved to 10.6 minimum SDK... and for 10.4 - compatible future
maintenance version we can get by as we do today.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: sal/inc

[Libreoffice Gerrit user]

 sal/inc/rtl/ustrbuf.hxx |   66 
 1 file changed, 66 insertions(+)

New commits:
commit 95841e1393868f0fa7d015b31accea960d35a7b6
Author: Norbert Thiebaud 
Date:   Mon Nov 19 22:34:58 2012 -0600

add strip* Family of function to OUStringBuffer

Change-Id: I225f95601009704c93484b6a68a0efd2446d4b48
Reviewed-on: https://gerrit.libreoffice.org/1140
Reviewed-by: Luboš Luňák 
Tested-by: Norbert Thiebaud 
Reviewed-by: Norbert Thiebaud 

diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx
index 201e790..a82a30b 100644
--- a/sal/inc/rtl/ustrbuf.hxx
+++ b/sal/inc/rtl/ustrbuf.hxx
@@ -1102,6 +1102,72 @@ public:
 pData->buffer, pData->length, literal, 
internal::ConstCharArrayDetector< T, void >::size - 1);
 }
 
+/**
+   Strip the given character from the start of the buffer.
+
+   @since LibreOffice 4.0
+
+   @paramc the character to strip
+   @return   The number of characters stripped
+
+*/
+sal_Int32 stripStart(sal_Unicode c = (sal_Unicode)' ')
+{
+sal_Int32 index;
+for(index = 0; index < getLength() ; index++)
+{
+if(pData->buffer[ index ] != c)
+{
+break;
+}
+}
+if(index)
+{
+remove(0, index);
+}
+return index;
+}
+
+/**
+   Strip the given character from the end of the buffer.
+
+   @since LibreOffice 4.0
+
+   @paramc the character to strip
+   @return   The number of characters stripped
+
+*/
+sal_Int32 stripEnd(sal_Unicode c = (sal_Unicode)' ')
+{
+sal_Int32 result = getLength();
+sal_Int32 index;
+for(index = getLength(); index > 0 ; index--)
+{
+if(pData->buffer[ index - 1 ] != c)
+{
+break;
+}
+}
+if(index < getLength())
+{
+remove(index);
+}
+return result - getLength();
+}
+/**
+   Strip the given character from the both end of the buffer.
+
+   @since LibreOffice 4.0
+
+   @paramc the character to strip
+   @return   The number of characters stripped
+
+*/
+sal_Int32 strip(sal_Unicode c = (sal_Unicode)' ')
+{
+return stripStart(c) + stripEnd(c);
+}
+
 private:
 /**
 A pointer to the data structur which contains the data.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] add strip* Family of function to OUStringBuffer

[Norbert Thiebaud (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/1140

Approvals:
  Norbert Thiebaud: Verified; Looks good to me, approved
  Luboš Luňák: Looks good to me, but someone else must approve


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I225f95601009704c93484b6a68a0efd2446d4b48
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Norbert Thiebaud 
Gerrit-Reviewer: Luboš Luňák 
Gerrit-Reviewer: Norbert Thiebaud 

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

[Libreoffice-commits] .: sal/osl

[Libreoffice Gerrit user]

 sal/osl/unx/file_url.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 754dc17b3f5d786329d454a4aed5fc9d1c91b0d9
Author: Caolán McNamara 
Date:   Wed Nov 21 15:02:53 2012 +

fix sal build

since reversion due to f78a2bcce88dd5c12052ae3e55c561cdd48b05fe

Change-Id: If60bb1931c1305068a86257fbbaa18029872e22e

diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx
index bf0d58d..082f85c 100644
--- a/sal/osl/unx/file_url.cxx
+++ b/sal/osl/unx/file_url.cxx
@@ -145,8 +145,6 @@ oslFileError SAL_CALL osl_getSystemPathFromFileURL( 
rtl_uString *ustrFileURL, rt
 sal_Unicode encodedSlash[3] = { '%', '2', 'F' };
 sal_Unicode protocolDelimiter[3] = { ':', '/', '/' };
 
-OSL_ASSERT(path != 0 && path->isEmpty());
-
 /* temporary hack: if already system path, return ustrFileURL */
 /*
 if( (sal_Unicode) '/' == ustrFileURL->buffer[0] )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - sc/source

[Libreoffice Gerrit user]

 sc/source/core/data/table2.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 274f3085ff15657d23dec7b9a1aa01fdfad6846c
Author: Markus Mohrhard 
Date:   Sat Nov 17 18:46:14 2012 +0100

fdo#56584: delete also note caption.

Change-Id: I1d792082e79d6bb68004a84c172cc3bb5c194826
Signed-off-by: Kohei Yoshida 

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index bc97e9c..cb9ae98 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -566,7 +566,7 @@ void ScTable::DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL 
nCol2, SCROW nRow2, sal
 }
 
 if (nDelFlag & IDF_NOTE)
-maNotes.erase( nCol1, nRow1, nCol2, nRow2, true );
+maNotes.erase( nCol1, nRow1, nCol2, nRow2 );
 
 if (IsStreamValid())
 // TODO: In the future we may want to check if the table has been
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

[Libreoffice Gerrit user]

 sw/source/core/crsr/bookmrk.cxx   |1 -
 sw/source/core/crsr/findtxt.cxx   |1 -
 sw/source/core/doc/docedt.cxx |6 +-
 sw/source/core/doc/docnum.cxx |2 --
 sw/source/core/draw/dflyobj.cxx   |1 -
 sw/source/core/layout/pagechg.cxx |1 -
 sw/source/core/layout/wsfrm.cxx   |1 -
 sw/source/core/unocore/unochart.cxx   |6 --
 sw/source/filter/html/htmlcss1.cxx|1 -
 sw/source/filter/html/htmlform.cxx|3 ---
 sw/source/filter/html/htmlftn.cxx |2 +-
 sw/source/filter/html/svxcss1.cxx |2 +-
 sw/source/filter/xml/xmltexti.cxx |1 -
 sw/source/ui/app/docsh.cxx|2 --
 sw/source/ui/config/fontcfg.cxx   |1 -
 sw/source/ui/config/mailconfigpage.cxx|1 -
 sw/source/ui/config/modcfg.cxx|2 --
 sw/source/ui/config/optpage.cxx   |6 --
 sw/source/ui/dbui/createaddresslistdialog.cxx |3 ---
 sw/source/ui/dbui/dbmgr.cxx   |2 --
 sw/source/ui/dbui/mailmergechildwindow.cxx|1 -
 sw/source/ui/dbui/mmconfigitem.cxx|1 -
 sw/source/ui/dbui/mmoutputpage.cxx|1 -
 sw/source/ui/dochdl/gloshdl.cxx   |1 -
 sw/source/ui/docvw/romenu.cxx |2 --
 sw/source/ui/fldui/flddok.cxx |1 -
 sw/source/ui/misc/glosbib.cxx |1 -
 sw/source/ui/misc/insrule.cxx |1 -
 sw/source/ui/misc/redlndlg.cxx|3 ---
 sw/source/ui/shells/frmsh.cxx |1 -
 sw/source/ui/shells/textfld.cxx   |1 -
 sw/source/ui/table/tautofmt.cxx   |1 -
 sw/source/ui/utlui/condedit.cxx   |1 -
 sw/source/ui/utlui/navipi.cxx |3 +--
 sw/source/ui/vba/vbaselection.cxx |1 -
 35 files changed, 4 insertions(+), 61 deletions(-)

New commits:
commit c1200f5eeed0d1ce974dd551c330f72546317630
Author: Luboš Luňák 
Date:   Wed Nov 21 16:04:11 2012 +0100

unused variables

Change-Id: I216b6ddff479ecf45a9950c05d4d65d55afbc7a1

diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index 75f58ca..fa209c9 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -191,7 +191,6 @@ namespace sw { namespace mark
 if(nCount == SAL_MAX_INT32)
 {
 sal_Int32 nRandom;
-::rtl::OUStringBuffer sUniquePostfixBuffer;
 rtl_random_getBytes(aPool, &nRandom, sizeof(nRandom));
 sUniquePostfix = 
::rtl::OUStringBuffer(13).append('_').append(static_cast(abs(nRandom))).makeStringAndClear();
 nCount = 0;
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index 76c843b..e9c40d7 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -665,7 +665,6 @@ String *ReplaceBackReferences( const SearchOptions& 
rSearchOpt, SwPaM* pPam )
 {
 utl::TextSearch aSTxt( rSearchOpt );
 String aStr( pPam->GetTxt() );
-String aSearchStr( rSearchOpt.searchString );
 String aReplaceStr( rSearchOpt.replaceString );
 aStr = comphelper::string::remove(aStr, CH_TXTATR_BREAKWORD);
 aStr = comphelper::string::remove(aStr, CH_TXTATR_INWORD);
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 9bd0196..dc6ae1d 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -757,9 +757,6 @@ bool SwDoc::Overwrite( const SwPaM &rRg, const String &rStr 
)
 SwIndex& rIdx = rPt.nContent;
 xub_StrLen nStart = 0;
 
-sal_Unicode c;
-String aStr;
-
 bool bOldExpFlg = pNode->IsIgnoreDontExpand();
 pNode->SetIgnoreDontExpand( true );
 
@@ -771,7 +768,7 @@ bool SwDoc::Overwrite( const SwPaM &rRg, const String &rStr 
)
 {
 lcl_SkipAttr( pNode, rIdx, nStart );
 }
-c = rStr.GetChar( nCnt );
+sal_Unicode c = rStr.GetChar( nCnt );
 if (GetIDocumentUndoRedo().DoesUndo())
 {
 bool bMerged(false);
@@ -1949,7 +1946,6 @@ uno::Any SwDoc::Spell( SwPaM& rPaM,
 uno::Reference< linguistic2::XProofreadingIterator 
>  xGCIterator( GetGCIterator() );
 if (xGCIterator.is())
 {
-String aText( 
((SwTxtNode*)pNd)->GetTxt().Copy( nBeginGrammarCheck, nEndGrammarCheck - 
nBeginGrammarCheck ) );
 uno::Reference< lang::XComponent > xDoc( 
((SwDocShell*)GetDocShell())->GetBaseModel(), uno::UNO_QUERY );
 // Expand the string:
 const ModelToViewHelper 
aConversionMap(*(SwTxtNode*)pNd);
diff --git a/sw/source/

Re: GTK theming: oxygen-gtk support broken

[Michael Meeks]

On Mon, 2012-11-19 at 23:55 +0400, Ruslan Kabatsayev wrote:
> OK, it appears that these commits have made LibO work more correctly
> in GTK handling, and now oxygen-gtk's old hacks to work around
> previous LibO incorrectness overcompensate the margins and need to be
> removed.

Drat ... that is annoying. Hopefully we ended up fixing everything in
the right place in the end though ?

> To get this all work more or less as expected (i.e. to fix oxygen-gtk
> at correct time), I'd need to know, which LibO releases will contain
> these commits. Any pointers to this?

Is it an easy thing to check from a gtk theme ? if not, is there
anything we can do to expose our version to theme authors more
helpfully ?

It'd be reasonably easy to set some g_object_data on our top-level
windows or somesuch - if that helps you ? I guess we have no
GApplication usage as of now (in case that helps).

Thanks so much for fixing things !

All the best,

Michael.

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

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

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

[Libreoffice Gerrit user]

 svtools/source/filter/wmf/winmtf.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit b740f2aeff67278c6f1741088a9be25aa823a8aa
Author: Thorsten Behrens 
Date:   Wed Nov 21 01:12:08 2012 +0100

Fix fdo#57353 correct moveTo handling for emf path recording

A moveTo following an existing path really should create a new
subpath, not add to the existing one. It's the equivalent of lifting
the pen.

Change-Id: I196ca9435f8b4225837add964aec7afceb1d6d88
Reviewed-on: https://gerrit.libreoffice.org/1147
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svtools/source/filter/wmf/winmtf.cxx 
b/svtools/source/filter/wmf/winmtf.cxx
index 2968ec1..fe4a461 100644
--- a/svtools/source/filter/wmf/winmtf.cxx
+++ b/svtools/source/filter/wmf/winmtf.cxx
@@ -1112,7 +1112,13 @@ void WinMtfOutput::MoveTo( const Point& rPoint, sal_Bool 
bRecordPath )
 {
 Point aDest( ImplMap( rPoint ) );
 if ( bRecordPath )
+{
+// fdo#57353 create new subpath for subsequent moves
+if ( aPathObj.Count() )
+if ( aPathObj[ aPathObj.Count() - 1 ].GetSize() )
+aPathObj.Insert( Polygon(), POLYPOLY_APPEND );
 aPathObj.AddPoint( aDest );
+}
 maActPos = aDest;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Change in core[libreoffice-3-6]: Fix fdo#57353 correct moveTo handling for emf path recording

[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/1147

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I196ca9435f8b4225837add964aec7afceb1d6d88
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: LibreOffice gerrit bot 
Gerrit-Reviewer: Caolán McNamara 
Gerrit-Reviewer: Thorsten Behrens 

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

Re: Shared Mac build host (was: Re: Funding Wishlist)

[Jonathan Aquilina]

Right now I am having nothing but nightmares with cppunit failing on said
imac trying to build against the 10.7 SDK. I will ping you on irc at some
point and maybe we can troubleshoot why I am having these issues.

On Wed, Nov 21, 2012 at 3:53 PM, Norbert Thiebaud wrote:

> It would be best if TDF owned outright at least enough hardware to be
> able to to a release on all supported platform..
>
> so I do agree with Thorsten request ot acquire a MAc, but I would also
> add the need for a TDF owned windows box.
>
> In fact I thing we should have a pair of each. one that cna be 'lent'
> to dev to allow them to debug/test things for bug that they cannot
> reproduce on their own hardware
> and one with much more restricted access to capable of building anf
> signing release build the later can also double as release branch
> tinderbox...
>
> money wise... we would have to 'buy' the Mac box.. since I don't know
> of any hosting provider that rent these... but the windows one can be
> 'rented' in a hosting facilities.
> What make financial sens is left to infra + BoD to decide.
>
> Norbert
>
> PS: the Mac do not need 10.4 SDK.. by the time they are online we will
> have moved to 10.6 minimum SDK... and for 10.4 - compatible future
> maintenance version we can get by as we do today.
>



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

Re: Funding Wishlist

[Marc Paré]

Le 2012-11-21 06:07, Thorsten Behrens a écrit :

Marc Paré wrote:

We are seriously looking at different teams' wishlists. Please do
take a little time out of your busy schedule and speak to your teams
about any funding for items that you think may be of importance to
your team or the enhance the functioning of your team's work on the
project.


Hi Marc,

thanks a lot for running this - and yes, I think the dev team would
benefit from some more tinderboxes. Unless there's other support
coming up, I'd like to suggest buying another Mac box for
gerrit/tinderboxing. I have an offer for a used Mac Mini as follows:

Mac Mini, last year's version, 2,7 GHz DualCore i7, 4 GB RAM, AMD
Radeon HD 6630M, OS X Lion, Samsung SSD 128 GB 470 Series MLC, HDMI,
DVI.

(like http://support.apple.com/kb/SP632 but with bigger cpu&  ssd)

Quote has it for € 700.

Cheers,

-- Thorsten





I'll go around and collect all of the requests in about a week and add 
them to the wiki[1]. Earlier if I see some items are debated/agreed by 
the team.


Cheers,

Marc

[1] http://wiki.documentfoundation.org/Marketing/Funding_Priorities

--
Marc Paré
m...@marcpare.com
http://www.parEntreprise.com
parEntreprise.com Supports OpenDocument Formats (ODF)
parEntreprise.com Supports http://www.LibreOffice.org

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

Re: Build errors on mac (WAS: what's the problem with system cairo ?)

[Stephan Bergmann]

On 11/20/2012 08:14 PM, Jonathan Aquilina wrote:

Turns out the issue with the hacked up moz that LO uses, disabling it
seems to have fixed the issue that I was experiencing.


Please note that on very recent master, on non-Windows platforms no 
functionality should depend on --enable-mozilla/module moz any more.


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

Re: GTK theming: oxygen-gtk support broken

[Ruslan Kabatsayev]

Hi Michael,

On Wed, Nov 21, 2012 at 7:09 PM, Michael Meeks  wrote:
>
>> To get this all work more or less as expected (i.e. to fix oxygen-gtk
>> at correct time), I'd need to know, which LibO releases will contain
>> these commits. Any pointers to this?
>
> Is it an easy thing to check from a gtk theme ?

This doesn't seem to be a very easy thing. Oxygen-gtk gets application
name via g_get_prgname() and also from PID reading /proc/$PID/cmdline.
Not very extensible for versions.

> It'd be reasonably easy to set some g_object_data on our top-level
> windows or somesuch - if that helps you ? I guess we have no
> GApplication usage as of now (in case that helps).

Yeah, g_object_set_data with LibO version on widget passed to theme
would be just fine.
Something like this:
g_object_set_data(G_OBJECT(widget),"LibreOfficeVersion",(gpointer)0xMAJVMINV).
At least this will work for gtk2, not for gtk3 since no widgets are
passed there. Though I don't think we really want to explicitely
support LibO in oxygen-gtk3.

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

Re: issues building against mac 10.7 sdk

[Alexander Thurgood]

Le 21/11/12 11:24, Jonathan Aquilina a écrit :

Hi Jonathan,

> I am aware that anything above 10.4 is experimental and can cause
> issues, but something that doesnt make sense for me is that Alexander
> Thurgood is able to build against the 10.8 sdk. I am not understanding
> for me why on earth my build fails in cppunit. Does this mean there is a
> failing unit test somewhere?

If you look re-read the e-mail I sent off list with my autogen switches,
you will note that I'm building against the 10.6 SDK and not the 10.8
SDK, which I haven't yet tried.

Alex


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

Re: Build errors on mac (WAS: what's the problem with system cairo ?)

[Jonathan Aquilina]

ok, my next question is what is the difference between --disable-mozilla
--disable-mozilla-build. If anything I am disabling mozilla. On my i mac i
have tried --disable-mozilla and it seems like it wasnt disabled. Are both
the above switches needed for it to be fully disabled?

On Wed, Nov 21, 2012 at 4:43 PM, Stephan Bergmann wrote:

> On 11/20/2012 08:14 PM, Jonathan Aquilina wrote:
>
>> Turns out the issue with the hacked up moz that LO uses, disabling it
>> seems to have fixed the issue that I was experiencing.
>>
>
> Please note that on very recent master, on non-Windows platforms no
> functionality should depend on --enable-mozilla/module moz any more.
>
> Stephan
> __**_
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.**org 
> http://lists.freedesktop.org/**mailman/listinfo/libreoffice
>



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

Re: issues building against mac 10.7 sdk

[Stephan Bergmann]

On 11/21/2012 11:24 AM, Jonathan Aquilina wrote:

I am not understanding for me why on earth my build fails in cppunit.


Nobody can if you don't show the build log.

Stephan

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

Re: issues building against mac 10.7 sdk

[Jonathan Aquilina]

I sent it in a previous email, which was rejected due to moderation and
being over 500kb :( it had the switches I am using as well as the build
error log attached.

On Wed, Nov 21, 2012 at 4:50 PM, Stephan Bergmann wrote:

> On 11/21/2012 11:24 AM, Jonathan Aquilina wrote:
>
>> I am not understanding for me why on earth my build fails in cppunit.
>>
>
> Nobody can if you don't show the build log.
>
> Stephan
>
>
> __**_
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.**org 
> http://lists.freedesktop.org/**mailman/listinfo/libreoffice
>



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

[Libreoffice-commits] .: solenv/bin

[Libreoffice Gerrit user]

 solenv/bin/linkoo |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 07f4845e485c5582089fa5551b874be600a94018
Author: Luboš Luňák 
Date:   Wed Nov 21 16:50:05 2012 +0100

unlink file before copying over it, to avoid it getting truncated first

Change-Id: I60cd57a5ae54bbe72c29568c1bbec65da3719491

diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 96abfa6..7b9ee4a 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -216,6 +216,7 @@ sub do_link(@)
if ($src_mtime > $dest_mtime) {
 #  print " copy $src/$src_name ($src_mtime) -> $dest/$dest_name 
($dest_mtime)\n";
print " copy $src/$src_name -> $dest/$dest_name\n";
+   unlink ("$dest/$dest_name");
copy("$src/$src_name", "$dest/$dest_name") || die "Failed top copy: 
$!";
} else {
 #  print " up-to-date $src/$src_name -> $dest/$dest_name\n";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Build errors on mac (WAS: what's the problem with system cairo ?)

[Stephan Bergmann]

On 11/21/2012 04:48 PM, Jonathan Aquilina wrote:

ok, my next question is what is the difference between --disable-mozilla
--disable-mozilla-build. If anything I am disabling mozilla. On my i mac
i have tried --disable-mozilla and it seems like it wasnt disabled. Are
both the above switches needed for it to be fully disabled?


None of those switches should be necessary on Mac OS X at all.

--disable-mozilla is implicitly set anyway.

There is no --disable-mozilla-build in configure.ac, just 
--with-mozilla-build, but the resulting MOZILLABUILD var appears to only 
be used on Windows anyway (in configure.ac and nss/makefile.mk).


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

[Libreoffice-commits] .: Branch 'feature/calc-xml-source' - sc/source

[Libreoffice Gerrit user]

 sc/source/filter/orcus/xmlcontext.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f1161eb78c9311a5de3ee8db92284f6c49900a7d
Author: Kohei Yoshida 
Date:   Wed Nov 21 10:58:24 2012 -0500

Adjusted for the orcus interface change on the master branch.

Change-Id: Ie99a1f90c55abf41f9f069fe26f19ed2f4370ae1

diff --git a/sc/source/filter/orcus/xmlcontext.cxx 
b/sc/source/filter/orcus/xmlcontext.cxx
index 9e0dbba..cc8eccd 100644
--- a/sc/source/filter/orcus/xmlcontext.cxx
+++ b/sc/source/filter/orcus/xmlcontext.cxx
@@ -171,7 +171,7 @@ bool ScOrcusXMLContextImpl::importXML(const 
ScOrcusImportXMLParam& rParam)
 const char* path = aSysPath.getStr();
 try
 {
-orcus::orcus_xml filter(&aFactory, NULL);
+orcus::orcus_xml filter(maNsRepo, &aFactory, NULL);
 
 // Set cell links.
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sal/inc

[Libreoffice Gerrit user]

 sal/inc/rtl/ustrbuf.hxx |   20 
 1 file changed, 20 insertions(+)

New commits:
commit bf246fce77cdfac7e031d93a912d0bf2071a6e5e
Author: Norbert Thiebaud 
Date:   Mon Nov 19 22:34:35 2012 -0600

a replace() to OUStringBuffer

Change-Id: I2cbfeea9800ad656c49ce1cae7ff1f4b830f1442
Reviewed-on: https://gerrit.libreoffice.org/1139
Reviewed-by: Norbert Thiebaud 
Tested-by: Norbert Thiebaud 

diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx
index a82a30b..25195f1 100644
--- a/sal/inc/rtl/ustrbuf.hxx
+++ b/sal/inc/rtl/ustrbuf.hxx
@@ -924,6 +924,26 @@ public:
 return *this;
 }
 
+/**
+   Replace all occurrences of
+   oldChar in this string buffer with newChar.
+
+   @since LibreOffice 4.0
+
+   @paramoldChar the old character.
+   @paramnewChar the new character.
+   @return   this string buffer
+*/
+OUStringBuffer& replace( sal_Unicode oldChar, sal_Unicode newChar )
+{
+sal_Int32 index = 0;
+while((index = indexOf(oldChar, index)) >= 0)
+{
+pData->buffer[ index ] = newChar;
+}
+return *this;
+}
+
 /** Allows access to the internal data of this OUStringBuffer, for 
effective
 manipulation.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] a replace() to OUStringBuffer

[Norbert Thiebaud (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/1139

Approvals:
  Norbert Thiebaud: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2cbfeea9800ad656c49ce1cae7ff1f4b830f1442
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Norbert Thiebaud 
Gerrit-Reviewer: Norbert Thiebaud 

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

[Libreoffice-commits] .: android/experimental

[Libreoffice Gerrit user]

 android/experimental/DocumentLoader/res/menu/option.xml
  |5 
 android/experimental/DocumentLoader/res/values/string.xml  
  |4 
 
android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
 |   71 +-
 3 files changed, 75 insertions(+), 5 deletions(-)

New commits:
commit 3ef3601f79ed6df6e02e207eac13666c53d4
Author: Miklos Vajna 
Date:   Wed Nov 21 16:35:08 2012 +0100

android: add 'go to page' menu item

Change-Id: Ie9d04ef9aeef5cacd1c3b8557111ee3a6194ccd4

diff --git a/android/experimental/DocumentLoader/res/menu/option.xml 
b/android/experimental/DocumentLoader/res/menu/option.xml
new file mode 100644
index 000..3230d83
--- /dev/null
+++ b/android/experimental/DocumentLoader/res/menu/option.xml
@@ -0,0 +1,5 @@
+
+http://schemas.android.com/apk/res/android";>
+  
+
diff --git a/android/experimental/DocumentLoader/res/values/string.xml 
b/android/experimental/DocumentLoader/res/values/string.xml
new file mode 100644
index 000..148461b
--- /dev/null
+++ b/android/experimental/DocumentLoader/res/values/string.xml
@@ -0,0 +1,4 @@
+
+
+Go to page
+
diff --git 
a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
 
b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
index 64d4248..3ee60ac 100644
--- 
a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
+++ 
b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
@@ -57,6 +57,8 @@
 package org.libreoffice.android.examples;
 
 import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
@@ -74,12 +76,16 @@ import android.os.Bundle;
 import android.util.Log;
 import android.view.GestureDetector;
 import android.view.Gravity;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.ViewGroup;
 import android.view.animation.Animation;
 import android.view.animation.AnimationSet;
 import android.view.animation.TranslateAnimation;
 import android.widget.ImageView;
+import android.widget.NumberPicker;
 import android.widget.TextView;
 import android.widget.ViewFlipper;
 import android.widget.ViewSwitcher;
@@ -1004,6 +1010,44 @@ public class DocumentLoader
 new DocumentLoadTask().executeOnExecutor(AsyncTask.SERIAL_EXECUTOR, 
"file://" + input);
 }
 
+private void goToPage(int number)
+{
+// Remove old views.
+flipper.removeAllViews();
+
+// Add new ones.
+flipper.addView(new PageViewer(number), 0, matchParent);
+for (int i = 0; i < PAGECACHE_PLUSMINUS; i++)
+flipper.addView(new PageViewer(number + i + 1), i + 1, 
matchParent);
+for (int i = 0; i < PAGECACHE_PLUSMINUS; i++)
+flipper.addView(new PageViewer(number + (i * -1) - 1), 
PAGECACHE_PLUSMINUS + i + 1, matchParent);
+}
+
+private void askPageNumber()
+{
+AlertDialog.Builder alert = new AlertDialog.Builder(this);
+alert.setTitle(R.string.go_to_page);
+final NumberPicker input = new NumberPicker(this);
+input.setMinValue(1);
+input.setMaxValue(documentContext.pageCount);
+alert.setView(input);
+alert.setPositiveButton("OK", new DialogInterface.OnClickListener()
+{
+public void onClick(DialogInterface dialog, int whichButton)
+{
+goToPage(input.getValue() - 1);
+}
+});
+
+alert.setNegativeButton("Cancel", new DialogInterface.OnClickListener()
+{
+public void onClick(DialogInterface dialog, int whichButton)
+{
+}
+});
+alert.show();
+}
+
 @Override
 public void onCreate(Bundle savedInstanceState)
 {
@@ -1048,11 +1092,7 @@ public class DocumentLoader
 int currentPageNumber = 0;
 if (savedInstanceState != null)
 currentPageNumber = 
savedInstanceState.getInt("currentPageNumber");
-flipper.addView(new PageViewer(currentPageNumber), 0, matchParent);
-for (int i = 0; i < PAGECACHE_PLUSMINUS; i++)
-flipper.addView(new PageViewer(currentPageNumber+i+1), i+1, 
matchParent);
-for (int i = 0; i < PAGECACHE_PLUSMINUS; i++)
-flipper.addView(new PageViewer(currentPageNumber+(i*-1)-1), 
PAGECACHE_PLUSMINUS + i+1, matchParent);
+goToPage(currentPageNumber);
 
 setContentView(flipper);
 }
@@ -1067,6 +1107,27 @@ public class DocumentLoader
 {
 return gestureDetector.onTouchEvent(event);
 }
+
+@Override
+public boolean onCreateOptionsM

Re: fdo#51004: some progress and 10 years old bug pending

[d . ostrovsky]

Quoting Stephan Bergmann :



Further clean-up of all the Mozilla-related configure switches  
(--enable-mozilla, --disable-build-mozilla, --with-mozilla-toolkit,  
--with-system-mozilla, --with-mozilla-build) and config_host.mk.in  
variables (BUILD_MOZAB, DEFAULT_MOZILLA_TOOLKIT, MOZILLABUILD,  
MOZILLA_VRESION, MOZ_FLAVOUR, MOZ_INC, MOZ_LIB, MOZ_LIB_XPCOM,  
PREBUILD_MOZAB, SYSTEM_MOZILLA, WITH_MOZILLA), which should all now  
be relevant for Windows only, is highly appreciated.


the only option that would stay forever (even after dropping the whole  
mozilla mess from the build tree) is --with-mozilla-build. It is used  
for nss to provide some build tools. I suggest to rename this option  
to --with-nss-build or something like that (without name mozilla in it).


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

[Libreoffice-commits] .: sdext/source

[Libreoffice Gerrit user]

 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 397f3e5d7b0b079ef3a6ef4b859ea2b2ab814b67
Author: Petr Mladek 
Date:   Wed Nov 21 17:37:26 2012 +0100

fix build with poppler-0.21.1

heh, they put back UTF8.h

Change-Id: Id915b1a1e41440a4b53058779355e99e3592e5fa

diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 7adc487..765d0be 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -34,7 +34,12 @@
 #pragma warning(push, 1)
 #endif
 
-#if POPPLER_CHECK_VERSION(0, 21, 0)
+// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1
+// FIXME: we can't use #if POPPLER_CHECK_VERSION(0, 21, 0) && 
!POPPLER_CHECK_VERSION(0, 21, 1)
+//because the internal poppler does not provide poppler-version.h and 
the macro always returns 0
+#if POPPLER_CHECK_VERSION(0, 21, 1)
+#include "UTF8.h"
+#elif POPPLER_CHECK_VERSION(0, 21, 0)
 #include "UTF.h"
 #else
 #include "UTF8.h"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 desktop/source/deployment/manager/dp_extensionmanager.cxx |   30 +-
 1 file changed, 29 insertions(+), 1 deletion(-)

New commits:
commit c6b955a2316d6943e37406d4a164b97bf85d7b20
Author: Stephan Bergmann 
Date:   Mon Nov 19 14:14:50 2012 +0100

fdo#57224: Preserve disabled-state across reinstallDeployedExtensions

(cherry picked from commit 6f9c3bc8edc93be07273d9de13dda19ea6c1da4a plus 
follow-
up a05e1e4967a21f3dd5a49215d97df99a7ec84f18 "fdo#57224: Fix logic of 
considering
optional/ambiguous value as 'disabled'")

Change-Id: Ic4f6cda4de758df4789e80b48b30f11ef810d2bd
Reviewed-on: https://gerrit.libreoffice.org/1119
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx 
b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index b3c21b4..cd09a9e 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -65,6 +65,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace deploy = com::sun::star::deployment;
 namespace lang  = com::sun::star::lang;
@@ -1220,6 +1221,31 @@ void ExtensionManager::reinstallDeployedExtensions(
 Reference
 xPackageManager = getPackageManager(repository);
 
+std::set< OUString > disabledExts;
+{
+const uno::Sequence< Reference > extensions(
+xPackageManager->getDeployedPackages(xAbortChannel, xCmdEnv));
+for ( sal_Int32 pos = 0; pos < extensions.getLength(); ++pos )
+{
+try
+{
+beans::Optional< beans::Ambiguous< sal_Bool > > registered(
+extensions[pos]->isRegistered(xAbortChannel, xCmdEnv));
+if (registered.IsPresent &&
+!(registered.Value.IsAmbiguous ||
+  registered.Value.Value))
+{
+const OUString id = dp_misc::getIdentifier(extensions[ 
pos ]);
+OSL_ASSERT(!id.isEmpty());
+disabledExts.insert(id);
+}
+}
+catch (const lang::DisposedException &)
+{
+}
+}
+}
+
 ::osl::MutexGuard guard(getMutex());
 xPackageManager->reinstallDeployedPackages(
 force, xAbortChannel, xCmdEnv);
@@ -1236,7 +1262,9 @@ void ExtensionManager::reinstallDeployedExtensions(
 const OUString id =  dp_misc::getIdentifier(extensions[ pos ]);
 const OUString fileName = extensions[ pos ]->getName();
 OSL_ASSERT(!id.isEmpty());
-activateExtension(id, fileName, false, true, xAbortChannel, 
xCmdEnv );
+activateExtension(
+id, fileName, disabledExts.find(id) != disabledExts.end(),
+true, xAbortChannel, xCmdEnv );
 }
 catch (const lang::DisposedException &)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: GTK theming: oxygen-gtk support broken

[Ruslan Kabatsayev]

Hi,

On Wed, Nov 21, 2012 at 6:36 PM, Ivan Timofeev  wrote:
> Hi,
>
> So, background gradients are fixed now with
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=a0a5eed63b871e2febb36e27e9dea4b7e57f681b

Thanks, I confirm that it's fixed.

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

[PUSHED] Change in core[libreoffice-3-6]: fdo#57224: Preserve disabled-state across reinstallDeployedE...

[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/1119

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


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

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

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

Re: [PUSHED] Xlib import via generic pkg-config

[Caolán McNamara]

On Wed, 2012-11-21 at 14:30 +, =?UTF-8?Q?Caol=C3=A1n_McNamara_ ?=
wrote:
> Hi,
> 
> Thank you for your patch! :-)  It has been merged to LibreOffice.

That didn't work out too well, as it turns out our baseline tinderbox is
apparently sufficiently old that it requires the x11_extensions or some
such.

Guess we'll have to get around to bumping to a RHEL-5-ish baseline and
see how far that takes us.

C.

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

[Libreoffice-commits] .: tools/inc

[Libreoffice Gerrit user]

 tools/inc/tools/gen.hxx |   35 +++
 1 file changed, 35 insertions(+)

New commits:
commit 3b1dcf2e35af2e5ec3405572a709876d0cfa63eb
Author: Luboš Luňák 
Date:   Wed Nov 21 17:52:00 2012 +0100

debug helpers for Point, Size, Rect, etc.

I'm kinda tired of typing it out (what kind of imbecile lumps all these
classes together into one header and still can't decide whether accessors
are Foo() or getFoo() and the capitalization of that?).

Change-Id: I15b69280265ae8570378f9f905cca66d546a252c

diff --git a/tools/inc/tools/gen.hxx b/tools/inc/tools/gen.hxx
index 6c93e2b..acbf75a 100644
--- a/tools/inc/tools/gen.hxx
+++ b/tools/inc/tools/gen.hxx
@@ -190,6 +190,13 @@ inline Point operator/( const Point &rVal1, const long 
nVal2 )
 return Point( rVal1.nA/nVal2, rVal1.nB/nVal2 );
 }
 
+template< typename charT, typename traits >
+inline std::basic_ostream & operator <<(
+std::basic_ostream & stream, const Point& point )
+{
+return stream << point.X() << ',' << point.Y();
+}
+
 // Size
 
 class SAL_WARN_UNUSED Size : public Pair
@@ -219,6 +226,13 @@ inline Size::Size( long nWidth, long nHeight ) :
 {
 }
 
+template< typename charT, typename traits >
+inline std::basic_ostream & operator <<(
+std::basic_ostream & stream, const Size& size )
+{
+return stream << size.Width() << 'x' << size.Height();
+}
+
 // Range
 
 #define RANGE_MAX   LONG_MAX
@@ -264,6 +278,13 @@ inline void Range::Justify()
 }
 }
 
+template< typename charT, typename traits >
+inline std::basic_ostream & operator <<(
+std::basic_ostream & stream, const Range& range )
+{
+return stream << range.Min() << '-' << range.Max();
+}
+
 // Selection
 
 #define SELECTION_MIN   LONG_MIN
@@ -323,6 +344,12 @@ inline void Selection::Justify()
 }
 }
 
+template< typename charT, typename traits >
+inline std::basic_ostream & operator <<(
+std::basic_ostream & stream, const Selection& selection )
+{
+return stream << selection.Min() << '-' << selection.Max();
+}
 // Rectangle
 
 #define RECT_EMPTY  ((short)-32767)
@@ -647,6 +674,14 @@ inline Rectangle operator - ( const Rectangle& rRect, 
const Point& rPt )
 return aRect;
 }
 
+template< typename charT, typename traits >
+inline std::basic_ostream & operator <<(
+std::basic_ostream & stream, const Rectangle& rectangle )
+{
+return stream << rectangle.getX() << ',' << rectangle.getY() << ' '
+<< rectangle.getWidth() << 'x' << rectangle.getHeight();
+}
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/calc-xml-source' - sc/source

[Libreoffice Gerrit user]

 sc/source/filter/orcus/xmlcontext.cxx |   27 +++
 1 file changed, 23 insertions(+), 4 deletions(-)

New commits:
commit a4c588ca5b5bbce9da8bd351ff96ef99cb3662c6
Author: Kohei Yoshida 
Date:   Wed Nov 21 12:01:51 2012 -0500

Display XML namespace IDs in the tree.

Change-Id: I7223b6ac750a5c96ce9638b490eeae109ed854ef

diff --git a/sc/source/filter/orcus/xmlcontext.cxx 
b/sc/source/filter/orcus/xmlcontext.cxx
index cc8eccd..86865cd 100644
--- a/sc/source/filter/orcus/xmlcontext.cxx
+++ b/sc/source/filter/orcus/xmlcontext.cxx
@@ -31,13 +31,33 @@ ScOrcusXMLTreeParam::EntryData& setUserDataToEntry(
 return rStore.back();
 }
 
+OUString toString(const orcus::xml_structure_tree::entity_name& entity, const 
orcus::xml_structure_tree::walker& walker)
+{
+OUStringBuffer aBuf;
+if (entity.ns)
+{
+// Namespace exists.  Namespaces are displayed as ns0, ns1, ns2, 
+size_t index = walker.get_xmlns_index(entity.ns);
+if (index == orcus::xml_structure_tree::walker::index_not_found)
+// This namespace doesn't exist in this context. Something has 
gone wrong.
+aBuf.append("???");
+else
+{
+aBuf.append("ns");
+aBuf.append(static_cast(index));
+}
+aBuf.append(':');
+}
+aBuf.append(OUString(entity.name.get(), entity.name.size(), 
RTL_TEXTENCODING_UTF8));
+return aBuf.makeStringAndClear();
+}
+
 void populateTree(
SvTreeListBox& rTreeCtrl, orcus::xml_structure_tree::walker& rWalker,
const orcus::xml_structure_tree::entity_name& rElemName, bool bRepeat,
SvTreeListEntry* pParent, ScOrcusXMLTreeParam& rParam)
 {
-OUString aName(rElemName.name.get(), rElemName.name.size(), 
RTL_TEXTENCODING_UTF8);
-SvTreeListEntry* pEntry = rTreeCtrl.InsertEntry(aName, pParent);
+SvTreeListEntry* pEntry = rTreeCtrl.InsertEntry(toString(rElemName, 
rWalker), pParent);
 if (!pEntry)
 // Can this ever happen!?
 return;
@@ -65,8 +85,7 @@ void populateTree(
 for (; it != itEnd; ++it)
 {
 orcus::xml_structure_tree::entity_name aAttrName = *it;
-SvTreeListEntry* pAttr = rTreeCtrl.InsertEntry(
-OUString(aAttrName.name.get(), aAttrName.name.size(), 
RTL_TEXTENCODING_UTF8), pEntry);
+SvTreeListEntry* pAttr = rTreeCtrl.InsertEntry(toString(aAttrName, 
rWalker), pEntry);
 
 if (!pAttr)
 continue;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: LO as an NPAPI browser plugin host?

[Caolán McNamara]

On Tue, 2012-11-20 at 16:15 +0100, Michael Stahl wrote:
> On 20/11/12 16:03, Caolán McNamara wrote:
> > The last time I fixed these I hacked totem to use the old api. i.e.
> > https://bugzilla.redhat.com/show_bug.cgi?id=475187
> 
> but who would want a totem plugin anyway when you can just use GStreamer
> etc. avmedia backends?  imho the only NPAPI plugin that's still of any
> use today is SWF/Flash.

Yup, which is why I didn't invest any time in bumping the version of the
plugin stuff we claim to support. But at the time there wasn't a 64bit
linux flash plugin (I think there is now?) and I wanted something to use
to verify that we were 64bit good with linux mozilla plugins.

C.

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

[Libreoffice-commits] .: tools/inc

[Libreoffice Gerrit user]

 tools/inc/tools/gen.hxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit be677b568690415ff90e7937d7269d3b41b39c16
Author: Luboš Luňák 
Date:   Wed Nov 21 18:24:28 2012 +0100

include necessary header

Change-Id: Ibfad213031a2ff07a752cf6b14a2fe35b6e285f4

diff --git a/tools/inc/tools/gen.hxx b/tools/inc/tools/gen.hxx
index acbf75a..2ddb21f 100644
--- a/tools/inc/tools/gen.hxx
+++ b/tools/inc/tools/gen.hxx
@@ -23,6 +23,7 @@
 #include 
 
 #include 
+#include 
 
 class SvStream;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits