[Libreoffice-commits] .: configure.in

[Libreoffice Gerrit user]

 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d756f2a304ed0921e1791c8eb91ce7fb7a085529
Author: Tor Lillqvist 
Date:   Sat Sep 29 08:37:16 2012 +0300

Make --enable-64-bit automatically turn on --enable-coretext

Change-Id: I4d2749d8da44fd8b469315c2be0093c19fc20be1

diff --git a/configure.in b/configure.in
index aca0eaf..7ba3b7a 100644
--- a/configure.in
+++ b/configure.in
@@ -10645,7 +10645,7 @@ dnl 
===
 ENABLE_CORETEXT=NO
 if test "$_os" = "Darwin"; then
 AC_MSG_CHECKING([whether to use CoreText framework])
-if test "$enable_coretext" = "yes"; then
+if test "$enable_coretext" = yes -o "$BITNESS_OVERRIDE" = 64; then
 AC_MSG_RESULT([yes])
 ENABLE_CORETEXT=YES
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - avmedia/Module_avmedia.mk config_host.mk.in configure.in postprocess/packcomponents scp2/InstallModule_ooo.mk scp2/source solenv/gbuild solenv/inc vcl/Library_vcl.

[Libreoffice Gerrit user]

 avmedia/Module_avmedia.mk  |2 +-
 config_host.mk.in  |1 -
 configure.in   |2 --
 postprocess/packcomponents/makefile.mk |2 +-
 scp2/InstallModule_ooo.mk  |3 ---
 scp2/source/ooo/file_library_ooo.scp   |2 +-
 solenv/gbuild/platform/macosx.mk   |8 
 solenv/inc/wntmsc.mk   |   12 ++--
 vcl/Library_vcl.mk |2 +-
 9 files changed, 18 insertions(+), 16 deletions(-)

New commits:
commit 4671e25d99bb2ad0f4f8f68c25fcc1bfce9e79b8
Author: Tor Lillqvist 
Date:   Fri Sep 28 13:21:59 2012 +0300

No need for BITNESS_OVERRIDE in makefilery as CPU etc work fine

Change-Id: I59f4d5ad275af62c997723908754112c062a31be

diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk
index 115ee13..f712344 100644
--- a/avmedia/Module_avmedia.mk
+++ b/avmedia/Module_avmedia.mk
@@ -47,7 +47,7 @@ $(eval $(call gb_Module_add_targets,avmedia,\
 endif
 
 ifeq ($(GUIBASE),aqua)
-ifneq ($(BITNESS_OVERRIDE),64)
+ifneq ($(CPUNAME),X86_64)
 $(eval $(call gb_Module_add_targets,avmedia,\
Library_avmediaQuickTime \
 ))
diff --git a/config_host.mk.in b/config_host.mk.in
index 2310098..7a511ea 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -56,7 +56,6 @@ export CDR_LIBS=@CDR_LIBS@
 export CDR_TARBALL=@CDR_TARBALL@
 export CHECK_PARALLELISM=@CHECK_PARALLELISM@
 export CLASSPATH=@CLASSPATH@
-export BITNESS_OVERRIDE=@BITNESS_OVERRIDE@
 export CLUCENE_CFLAGS=@CLUCENE_CFLAGS@
 export CLUCENE_LIBS=@CLUCENE_LIBS@
 export CLUCENE_TARBALL=@CLUCENE_TARBALL@
diff --git a/configure.in b/configure.in
index be63978..aca0eaf 100644
--- a/configure.in
+++ b/configure.in
@@ -2865,8 +2865,6 @@ AC_SUBST(ENABLE_DIRECTX)
 AC_SUBST(DISABLE_ACTIVEX)
 AC_SUBST(DISABLE_ATL)
 
-AC_SUBST(BITNESS_OVERRIDE)
-
 if test "$cross_compiling" = "yes"; then
 CROSS_COMPILING=YES
 SCPDEFS="$SCPDEFS -DCROSS_COMPILING"
diff --git a/postprocess/packcomponents/makefile.mk 
b/postprocess/packcomponents/makefile.mk
index 998a13f..8b2aea2 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -328,7 +328,7 @@ my_components += \
 .END
 
 .IF "$(GUIBASE)" == "aqua"
-.IF "$(BITNESS_OVERRIDE)" != "64"
+.IF "$(CPUNAME)" != "X86_64"
 my_components += \
 component/avmedia/source/quicktime/avmediaQuickTime
 .ENDIF
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 459cbf6..5ca6b6c 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -166,9 +166,6 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
$(if $(filter-out YES,$(WITH_MYSPELL_DICTS)),\
-DWITHOUT_MYSPELL_DICTS \
) \
-   $(if $(BITNESS_OVERRIDE),\
-   -DBITNESS_OVERRIDE=$(BITNESS_OVERRIDE) \
-   ) \
 ))
 
 ifeq ($(DISABLE_PYTHON),TRUE)
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index 828c476..3cc740b 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -528,7 +528,7 @@ File gid_File_Lib_MacOSXSpell
Dir = SCP2_OOO_BIN_DIR;
 End
 
-#if !defined(BITNESS_OVERRIDE) || BITNESS_OVERRIDE==32
+#ifndef X86_64
 File gid_File_Lib_avmediaQuickTime
LIB_FILE_BODY;
Styles = (PACKED);
diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
index 4e8b7be..ef6e589 100644
--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -29,7 +29,7 @@
 
 JAVAFLAGSDEBUG=-g
 
-.IF "$(BITNESS_OVERRIDE)" == ""
+.IF "$(CPU)" == "I"
 ASM=ml
 AFLAGS=/c /Cp /coff /safeseh
 .ELSE
@@ -89,7 +89,7 @@ CFLAGS+=-GS
 
 CFLAGS+=-c -nologo -Gs $(NOLOGO)
 
-.IF "$(BITNESS_OVERRIDE)" == ""
+.IF "$(CPU)" == "I"
 CDEFS+= -D_X86_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE 
-D_CRT_NON_CONFORMING_SWPRINTFS -D_SCL_SECURE_NO_WARNINGS
 .ELSE
 CDEFS+= -D_AMD64_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE 
-D_CRT_NON_CONFORMING_SWPRINTFS -D_SCL_SECURE_NO_WARNINGS
@@ -119,7 +119,7 @@ CFLAGS+= -Z7
 CFLAGSEXCEPTIONS=-EHa
 CFLAGS_NO_EXCEPTIONS=
 
-.IF "$(BITNESS_OVERRIDE)" == ""
+.IF "$(CPU)" == "I"
 # enable boost support for __cdecl (SAL_CALL) C++-UNO interface methods
 CDEFS+=-DBOOST_MEM_FN_ENABLE_CDECL
 .ENDIF
@@ -204,7 +204,7 @@ _VC_MANIFEST_BASENAME=__VC80
 _VC_MANIFEST_BASENAME=__VC90
 .ENDIF
 
-.IF "$(BITNESS_OVERRIDE)" == ""
+.IF "$(CPU)" == "I"
 LINK=link /MACHINE:IX86 /IGNORE:4102 /IGNORE:4197
 .ELSE
 LINK=link /MACHINE:X64
@@ -217,7 +217,7 @@ LINKFLAGS=/MAP /OPT:NOREF
 .ENDIF
 
 # excetion handling protection
-.IF "$(BITNESS_OVERRIDE)" == ""
+.IF "$(CPU)" == "I"
 LINKFLAGS+=-safeseh
 .ENDIF
 
@@ -301,7 +301,7 @@ LIBMGR=lib $(NOLOGO)
 IMPLIB=lib
 LIBFLAGS=
 
-.IF "$(BITNESS_OVERRIDE)" == ""
+.IF "$(CPU)" == "I"
 IMPLIBFLAGS=-machine:IX86
 .ELSE
 IMPLIBFLAGS=-machine:X64
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 6eebaeb..6aaa675 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -437,7 +437

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

[Libreoffice Gerrit user]

 sc/source/ui/inc/xmlsourcedlg.hxx |4 +++-
 sc/source/ui/src/xmlsourcedlg.src |2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 82689aece5c8f9e344b71bf849f286252f6cd1b7
Author: Kohei Yoshida 
Date:   Fri Sep 28 22:34:46 2012 -0400

Pop up a full path in case the path is cut off.

Change-Id: I7a5c1fe86c4162de6d3dec301cbea6299d07212d

diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx 
b/sc/source/ui/inc/xmlsourcedlg.hxx
index 44dd44e..6e32d12 100644
--- a/sc/source/ui/inc/xmlsourcedlg.hxx
+++ b/sc/source/ui/inc/xmlsourcedlg.hxx
@@ -15,6 +15,8 @@
 #include "vcl/fixed.hxx"
 #include "svtools/svtreebx.hxx"
 
+#include "expftext.hxx"
+
 #include 
 
 class ScDocument;
@@ -31,7 +33,7 @@ class ScXMLSourceDlg : public ModalDialog
 {
 FixedLine maFlSourceFile;
 ImageButton maBtnSelectSource;
-FixedText maFtSourceFile;
+ScExpandedFixedText maFtSourceFile;
 
 FixedLine maFtMapXmlDoc;
 
diff --git a/sc/source/ui/src/xmlsourcedlg.src 
b/sc/source/ui/src/xmlsourcedlg.src
index 86f8a7d..f55110b 100644
--- a/sc/source/ui/src/xmlsourcedlg.src
+++ b/sc/source/ui/src/xmlsourcedlg.src
@@ -35,7 +35,7 @@ ModalDialog RID_SCDLG_XML_SOURCE
 FixedText FT_SOURCE_FILE
 {
 Pos = MAP_APPFONT ( 25 , 21 ) ;
-Size = MAP_APPFONT ( 225 , 8 ) ;
+Size = MAP_APPFONT ( 219 , 8 ) ;
 
 Text [ en-US ] = "- not set -";
 };
___
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/inc sc/source

[Libreoffice Gerrit user]

 sc/inc/filter.hxx   |4 +++-
 sc/inc/orcusfilters.hxx |3 +++
 sc/source/filter/inc/orcusfiltersimpl.hxx   |2 ++
 sc/source/filter/orcus/orcusfiltersimpl.cxx |   19 ---
 sc/source/ui/inc/xmlsourcedlg.hxx   |1 +
 sc/source/ui/xmlsource/xmlsourcedlg.cxx |   13 +
 6 files changed, 38 insertions(+), 4 deletions(-)

New commits:
commit e26535de6ddc467d94eac1c4010e9e7ab55ae283
Author: Kohei Yoshida 
Date:   Fri Sep 28 22:19:46 2012 -0400

Call orcus filter accessor from the dialog when a new source file is set.

For now it doesn't do anything.

Change-Id: I8e41c7e15c3b99ab0ddec8e68242176c97f368fc

diff --git a/sc/inc/filter.hxx b/sc/inc/filter.hxx
index 2359927..7eef93d 100644
--- a/sc/inc/filter.hxx
+++ b/sc/inc/filter.hxx
@@ -32,6 +32,8 @@
 #include 
 #include 
 
+#include "scdllapi.h"
+
 class SfxMedium;
 class SvStream;
 
@@ -133,7 +135,7 @@ extern "C" {
 
 class ScFormatFilter {
 public:
-static ScFormatFilterPlugin &Get();
+SC_DLLPUBLIC static ScFormatFilterPlugin &Get();
 };
 
 #endif
diff --git a/sc/inc/orcusfilters.hxx b/sc/inc/orcusfilters.hxx
index b7e3198..2379c67 100644
--- a/sc/inc/orcusfilters.hxx
+++ b/sc/inc/orcusfilters.hxx
@@ -13,6 +13,7 @@
 #include "rtl/ustring.hxx"
 
 class ScDocument;
+class SvTreeListBox;
 
 /**
  * Collection of orcus filter wrappers.
@@ -23,6 +24,8 @@ public:
 virtual ~ScOrcusFilters() {}
 
 virtual bool importCSV(ScDocument& rDoc, const rtl::OUString& rPath) const 
= 0;
+
+virtual bool loadXMLStructure(const rtl::OUString& rPath, SvTreeListBox& 
rTree) const = 0;
 };
 
 #endif
diff --git a/sc/source/filter/inc/orcusfiltersimpl.hxx 
b/sc/source/filter/inc/orcusfiltersimpl.hxx
index e349120..f51f00f 100644
--- a/sc/source/filter/inc/orcusfiltersimpl.hxx
+++ b/sc/source/filter/inc/orcusfiltersimpl.hxx
@@ -16,6 +16,8 @@ class ScOrcusFiltersImpl : public ScOrcusFilters
 {
 public:
 virtual bool importCSV(ScDocument& rDoc, const rtl::OUString& rPath) const;
+
+virtual bool loadXMLStructure(const rtl::OUString& rPath, SvTreeListBox& 
rTree) const;
 };
 
 #endif
diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx 
b/sc/source/filter/orcus/orcusfiltersimpl.cxx
index 3c8c211..7152b68 100644
--- a/sc/source/filter/orcus/orcusfiltersimpl.cxx
+++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx
@@ -7,11 +7,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include "orcusfiltersimpl.hxx"
+
 #include "document.hxx"
 
 #include "tools/urlobj.hxx"
-
-#include "orcusfiltersimpl.hxx"
+#include "svtools/svtreebx.hxx"
 
 #define __ORCUS_STATIC_LIB
 #include 
@@ -143,7 +144,8 @@ bool ScOrcusFiltersImpl::importCSV(ScDocument& rDoc, const 
OUString& rPath) cons
 {
 ScOrcusFactory aFactory(rDoc);
 INetURLObject aURL(rPath);
-const char* path = rtl::OUStringToOString(aURL.getFSysPath(SYSTEM_PATH), 
RTL_TEXTENCODING_UTF8).getStr();
+OString aSysPath = rtl::OUStringToOString(aURL.getFSysPath(SYSTEM_PATH), 
RTL_TEXTENCODING_UTF8);
+const char* path = aSysPath.getStr();
 
 try
 {
@@ -159,4 +161,15 @@ bool ScOrcusFiltersImpl::importCSV(ScDocument& rDoc, const 
OUString& rPath) cons
 return true;
 }
 
+bool ScOrcusFiltersImpl::loadXMLStructure(const OUString& rPath, 
SvTreeListBox& /*rTree*/) const
+{
+INetURLObject aURL(rPath);
+OString aSysPath = rtl::OUStringToOString(aURL.getFSysPath(SYSTEM_PATH), 
RTL_TEXTENCODING_UTF8);
+const char* path = aSysPath.getStr();
+fprintf(stdout, "ScOrcusFiltersImpl::loadXMLStructure:   path = '%s'\n", 
path);
+
+// TODO: Load the tree box.
+return true;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx 
b/sc/source/ui/inc/xmlsourcedlg.hxx
index 5a54c70..44dd44e 100644
--- a/sc/source/ui/inc/xmlsourcedlg.hxx
+++ b/sc/source/ui/inc/xmlsourcedlg.hxx
@@ -50,6 +50,7 @@ public:
 private:
 
 void SelectSourceFile();
+void LoadSourceFileStructure(const OUString& rPath);
 
 DECL_LINK(BtnPressedHdl, Button*);
 };
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx 
b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index e44f5c0..e94d132 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -12,6 +12,8 @@
 
 #include "scresid.hxx"
 #include "document.hxx"
+#include "orcusfilters.hxx"
+#include "filter.hxx"
 
 #include 
 #include 
@@ -81,6 +83,17 @@ void ScXMLSourceDlg::SelectSourceFile()
 
 // There should only be one file returned from the file picker.
 maFtSourceFile.SetText(aFiles[0]);
+
+LoadSourceFileStructure(aFiles[0]);
+}
+
+void ScXMLSourceDlg::LoadSourceFileStructure(const OUString& rPath)
+{
+ScOrcusFilters* pOrcus = ScFormatFilter::Get().GetOrcusFilters();
+if (!pOrcus)
+return;
+
+pOrcus->loadXMLStructure(rPath, maLbTree);
 }
 
 IMPL_LINK(ScXMLSourceDlg, BtnPressedHdl, Button*, pBtn)

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

[Libreoffice Gerrit user]

 sc/inc/scabstdlg.hxx|2 -
 sc/source/ui/attrdlg/scdlgfact.cxx  |4 +-
 sc/source/ui/attrdlg/scdlgfact.hxx  |2 -
 sc/source/ui/inc/xmlsourcedlg.hxx   |   14 +
 sc/source/ui/view/cellsh1.cxx   |2 -
 sc/source/ui/xmlsource/xmlsourcedlg.cxx |   46 ++--
 6 files changed, 62 insertions(+), 8 deletions(-)

New commits:
commit 6072c41d03ab3742c282e1b633380e552a684d25
Author: Kohei Yoshida 
Date:   Fri Sep 28 20:22:23 2012 -0400

Use file picker dialog to pick the source xml file.

Change-Id: Ie927d8a83fa93e3f61c2c2133fe655854667854c

diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 9623615..5c04cec 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -537,7 +537,7 @@ public:
 virtual SfxAbstractTabDialog * CreateScSortDlg( Window*  pParent, 
//add for ScSortDlg
 const SfxItemSet* 
pArgSet,int nId ) = 0;
 
-virtual AbstractScXMLSourceDlg* CreateScXMLSourceDlg(Window* pParent, int 
nId) = 0;
+virtual AbstractScXMLSourceDlg* CreateScXMLSourceDlg(Window* pParent, 
ScDocument* pDoc, int nId) = 0;
 
 // for tabpage
 virtual CreateTabPage   GetTabPageCreatorFunc( sal_uInt16 nId 
) = 0;
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 9257a9e..d437807 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -1596,9 +1596,9 @@ SfxAbstractTabDialog * 
ScAbstractDialogFactory_Impl::CreateScSortDlg( Window*
 return 0;
 }
 
-AbstractScXMLSourceDlg* 
ScAbstractDialogFactory_Impl::CreateScXMLSourceDlg(Window* pParent, int nId)
+AbstractScXMLSourceDlg* 
ScAbstractDialogFactory_Impl::CreateScXMLSourceDlg(Window* pParent, ScDocument* 
pDoc, int nId)
 {
-ScXMLSourceDlg* pDlg = (nId == RID_SCDLG_XML_SOURCE) ? new 
ScXMLSourceDlg(pParent) : NULL;
+ScXMLSourceDlg* pDlg = (nId == RID_SCDLG_XML_SOURCE) ? new 
ScXMLSourceDlg(pParent, pDoc) : NULL;
 
 return pDlg ? new AbstractScXMLSourceDlg_Impl(pDlg) : NULL;
 }
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx 
b/sc/source/ui/attrdlg/scdlgfact.hxx
index 73b35d9..c250582 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -610,7 +610,7 @@ public:
 virtual SfxAbstractTabDialog * CreateScSortDlg( Window*  pParent, 
//add for ScSortDlg
 const SfxItemSet* 
pArgSet,int nId );
 
-virtual AbstractScXMLSourceDlg* CreateScXMLSourceDlg(Window* pParent, int 
nId);
+virtual AbstractScXMLSourceDlg* CreateScXMLSourceDlg(Window* pParent, 
ScDocument* pDoc, int nId);
 
 // For TabPage
 virtual CreateTabPage   GetTabPageCreatorFunc( sal_uInt16 nId 
);
diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx 
b/sc/source/ui/inc/xmlsourcedlg.hxx
index 2213d42..5a54c70 100644
--- a/sc/source/ui/inc/xmlsourcedlg.hxx
+++ b/sc/source/ui/inc/xmlsourcedlg.hxx
@@ -15,6 +15,10 @@
 #include "vcl/fixed.hxx"
 #include "svtools/svtreebx.hxx"
 
+#include 
+
+class ScDocument;
+
 class ScXMLSourceTree : public SvTreeListBox
 {
 Image maImgElemDefault;
@@ -37,9 +41,17 @@ class ScXMLSourceDlg : public ModalDialog
 
 Image maImgFileOpen;
 
+ScDocument* mpDoc;
+
 public:
-ScXMLSourceDlg(Window* pParent);
+ScXMLSourceDlg(Window* pParent, ScDocument* pDoc);
 virtual ~ScXMLSourceDlg();
+
+private:
+
+void SelectSourceFile();
+
+DECL_LINK(BtnPressedHdl, Button*);
 };
 
 #endif
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 074f69a..4a3c6c8 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -2451,7 +2451,7 @@ void ScCellShell::ExecuteXMLSourceDialog()
 
 boost::scoped_ptr pDlg(
 pFact->CreateScXMLSourceDlg(
-pTabViewShell->GetDialogParent(), RID_SCDLG_XML_SOURCE));
+pTabViewShell->GetDialogParent(), GetViewData()->GetDocument(), 
RID_SCDLG_XML_SOURCE));
 
 if (!pDlg)
 return;
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx 
b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index 378ba5f..e44f5c0 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -11,6 +11,14 @@
 #include "xmlsourcedlg.hrc"
 
 #include "scresid.hxx"
+#include "document.hxx"
+
+#include 
+#include 
+#include 
+
+using namespace com::sun::star;
+
 
 ScXMLSourceTree::ScXMLSourceTree(Window* pParent, const ResId& rResId) :
 SvTreeListBox(pParent, rResId),
@@ -30,7 +38,7 @@ ScXMLSourceTree::ScXMLSourceTree(Window* pParent, const 
ResId& rResId) :
 Expand(pPar);
 }
 
-ScXMLSourceDlg::ScXMLSourceDlg(Window* pParent) :
+ScXMLSourceDlg::ScXMLSourceDlg(Window* pParent, ScDocument* pDoc) :
 ModalDialog(pParent, ScResId(RID_SCDLG_XML_SOURCE)),
 maFlSourceFile(this, ScResId(FL_SOURCE_FILE)),
 maBtnSelectSource(this, ScResId(BTN_SELECT_SOURCE_

[PATCH] use "LibreOffice" as the default value of ProductKey for cra...

[Takeshi Abe (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/721

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/21/721/1

use "LibreOffice" as the default value of ProductKey for crashrep

Change-Id: I12bab12ad32f4965b55d94dfd2d6fe8894129763
---
M crashrep/source/win32/soreport.cpp
1 file changed, 1 insertion(+), 1 deletion(-)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I12bab12ad32f4965b55d94dfd2d6fe8894129763
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Takeshi Abe 

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

[PATCH] Add back compatible Hungarian date format acceptance

[via Code Review]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/720

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/20/720/1

Add back compatible Hungarian date format acceptance

Change-Id: I6b6d62cda241250db89cdcabaa04952d36e1acfd
---
M i18npool/source/localedata/data/hu_HU.xml
1 file changed, 2 insertions(+), 0 deletions(-)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b6d62cda241250db89cdcabaa04952d36e1acfd
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Németh László 

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

[REVIEW-3-6] fix for fdo#54558, ext entries in extlst do not need to have a corresponding normal entry

[Markus Mohrhard]

Hey,

after studying the ooxml spec again the right fix for the other crash
with the test document from fdo#54558 is that we need to handle
missing elements for the corresponding extLst. The ooxml spec allows
to have the ext entry but not the corresponding normal element.

Regards,
Markus

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

[PATCH] Remove unused methods

[Marcos Paulo de Souza]

Just a cleanup.

Change-Id: I8fc47c39ede4e5b06af2144667ede5e9c2d5b397
Signed-off-by: Marcos Paulo de Souza 
---
 unotools/inc/unotools/useroptions.hxx  |8 
 unotools/source/config/useroptions.cxx |8 
 unusedcode.easy|8 
 3 files changed, 24 deletions(-)

diff --git a/unotools/inc/unotools/useroptions.hxx 
b/unotools/inc/unotools/useroptions.hxx
index 502fcce5..a7b2267 100644
--- a/unotools/inc/unotools/useroptions.hxx
+++ b/unotools/inc/unotools/useroptions.hxx
@@ -78,14 +78,6 @@ public:
 rtl::OUString GetFullName   () const;
 
 // set the address token
-void SetCompany(rtl::OUString const&);
-void SetFirstName  (rtl::OUString const&);
-void SetID (rtl::OUString const&);
-void SetState  (rtl::OUString const&);
-void SetCountry(rtl::OUString const&);
-void SetPosition   (rtl::OUString const&);
-void SetTitle  (rtl::OUString const&);
-void SetFax(rtl::OUString const&);
 void SetCustomerNumber (rtl::OUString const&);
 
 sal_Bool  IsTokenReadonly (sal_uInt16 nToken) const;
diff --git a/unotools/source/config/useroptions.cxx 
b/unotools/source/config/useroptions.cxx
index a8efcd1..1da014a 100644
--- a/unotools/source/config/useroptions.cxx
+++ b/unotools/source/config/useroptions.cxx
@@ -317,14 +317,6 @@ OUString SvtUserOptions::GetCustomerNumber () const { 
return GetToken(USER_OPT_C
 //
 // setters
 //
-void SvtUserOptions::SetCompany   (OUString const& sToken) { 
SetToken(USER_OPT_COMPANY,   sToken); }
-void SvtUserOptions::SetFirstName (OUString const& sToken) { 
SetToken(USER_OPT_FIRSTNAME, sToken); }
-void SvtUserOptions::SetID(OUString const& sToken) { 
SetToken(USER_OPT_ID,sToken); }
-void SvtUserOptions::SetState (OUString const& sToken) { 
SetToken(USER_OPT_STATE, sToken); }
-void SvtUserOptions::SetCountry   (OUString const& sToken) { 
SetToken(USER_OPT_COUNTRY,   sToken); }
-void SvtUserOptions::SetPosition  (OUString const& sToken) { 
SetToken(USER_OPT_POSITION,  sToken); }
-void SvtUserOptions::SetTitle (OUString const& sToken) { 
SetToken(USER_OPT_TITLE, sToken); }
-void SvtUserOptions::SetFax   (OUString const& sToken) { 
SetToken(USER_OPT_FAX,   sToken); }
 void SvtUserOptions::SetCustomerNumber (OUString const& sToken) { 
SetToken(USER_OPT_CUSTOMERNUMBER, sToken); }
 
 // ---
diff --git a/unusedcode.easy b/unusedcode.easy
index a4612b7..1ac9306 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -7,14 +7,6 @@ 
ScVbaFormat::setNumberFormat(com::sun::star::lang::Loca
 ScVbaFormat::getAddIndent()
 ScVbaFormat::setAddIndent(com::sun::star::uno::Any 
const&)
 
ScVbaFormat::setNumberFormat(com::sun::star::lang::Locale,
 rtl::OUString const&)
-SvtUserOptions::SetCompany(rtl::OUString const&)
-SvtUserOptions::SetCountry(rtl::OUString const&)
-SvtUserOptions::SetFax(rtl::OUString const&)
-SvtUserOptions::SetFirstName(rtl::OUString const&)
-SvtUserOptions::SetID(rtl::OUString const&)
-SvtUserOptions::SetPosition(rtl::OUString const&)
-SvtUserOptions::SetState(rtl::OUString const&)
-SvtUserOptions::SetTitle(rtl::OUString const&)
 TextEngine::GetLeftMargin() const
 ThumbnailView::GetItemCount() const
 ThumbnailView::ImplScroll(Point const&)
-- 
1.7.9.5

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

[REVIEW-3-6] fix for fdo#54558, crash during cached value import of

[Markus Mohrhard]

Hey,

[1] fixes a crash during the xlsx import of cached value for array
formulas. The solution is to check that the cell exists and move the
array formula import in front of the cached value import.

Regards,
Markus

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

P.S. Please also correct the bug nr from 54559 to 54558 when cherry-picking
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[REVIEW-3-6] fix for fdo#55174, con't crash durig oox import for vba procedure names or macro names

[Markus Mohrhard]

Hey,

[1] fixes a crash that happens if we try to import a vba procedure
name or macro name as range name. The code does not create a
ScRangeData for these names and we should not try to create formulas
for them. This is a regression introduced by porting this code from
uno calls to direct calls.

Regards,
Markus

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

[REVIEW-3-6] fdo#55379, handle the lifetime of mpCondFormat correctly

[Markus Mohrhard]

Hey,

[1] fixes another problem with the cond format import for the old cond
format data structures. The style might be imported several times with
different ranges and therefore we may delete the mpCondFormat which is
then owned by the ptr_set in ScConditionalFormatList.

Regards,
Markus

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

Re: [Libreoffice-qa] LO 3.6.2 : about Manage dialog from Conditional Formatting

[Jean-Baptiste Faure]

Hi Bjoern,

Thank you very much for your kind words.

I think that this story shows that we need more discussion between
developers, QA-team and power users.
Later I will try to make constructive propositions to improve our
collaboration, for the moment I am building the master to test the
patches commited by Michael for fdo54940. :-)

Best regards.
JBF

Le 28/09/2012 11:29, Bjoern Michaelsen a écrit :
> Hi Jean-Baptiste,
>
> On Wed, Sep 26, 2012 at 10:29:20AM +0200, Bjoern Michaelsen wrote:
>> On Wed, Sep 26, 2012 at 06:35:57AM +0200, Jean-Baptiste Faure wrote:
>>> Nobody interested to test and answer?
>> I think it is rather that most in QA already have their share of critical 
>> bugs
>> to care about.
> just wanted to follow up on this one as while we discussed the issue at hand
> some more in private, my initial email was probably quite a bit harsh when
> standing on its own.
>
> Given that, I was happy that you continued to discuss it constructively. Still
> please accept my apologies for the inital blunt reply, and I hope the issue
> at hand can be worked out satisfactorily in due time.
>
> Best,
>
> Bjoern
> ___
> List Name: Libreoffice-qa mailing list
> Mail address: libreoffice...@lists.freedesktop.org
> Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
> Problems? 
> http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
> Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
> List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
>


-- 
Seuls des formats ouverts peuvent assurer la pérennité de vos documents.

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

[Libreoffice-commits] .: Branch 'feature/killsdf' - solenv/gbuild

[Libreoffice Gerrit user]

 solenv/gbuild/ExtensionTarget.mk |   16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 25e2d8eefd0371bec1fc0ccbd68f0d4aa1de102c
Author: Andras Timar 
Date:   Fri Sep 28 22:11:54 2012 +0200

depend on po files not on localize.sdf

Change-Id: Ib386d1c87d0efbd81462924993e1c18165870991

diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk
index 80ab561..481c4b9 100644
--- a/solenv/gbuild/ExtensionTarget.mk
+++ b/solenv/gbuild/ExtensionTarget.mk
@@ -298,10 +298,12 @@ $(call 
gb_ExtensionTarget_get_rootdir,$(1))/help/$(5).done : HELPFILES += $(3)
 $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5).done : \
 $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3)
 ifneq ($(strip $(gb_WITH_LANG)),)
+ifneq ($(filter-out en-US,$(5)),)
 $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \
-SDF := $(gb_SDFLOCATION)$(subst $(SRCDIR),,$(subst 
$(WORKDIR)/CustomTarget,,$(2)/$(dir $(or $(4),$(3)localize.sdf
+   POFILE := $(gb_POLOCATION)/$(5)/$(subst $(SRCDIR),,$(2))/$(subst 
/$(lastword $(subst /, ,$(3))),.po,$(3))
 $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \
-$(gb_SDFLOCATION)$(subst $(SRCDIR),,$(subst 
$(WORKDIR)/CustomTarget,,$(2)/$(dir $(or $(4),$(3)localize.sdf
+$(gb_POLOCATION)/$(5)/$(subst $(SRCDIR),,$(2))/$(subst /$(lastword 
$(subst /, ,$(3))),.po,$(3))
+endif
 endif
 $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \
 $(if $(filter-out en-US,$(5)),$(gb_ExtensionTarget_HELPEXTARGET)) | \
@@ -313,7 +315,7 @@ $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) 
: \
 mkdir -p $$(dir $$@) && \
 $(if $(filter-out en-US,$(5)), \
 $(gb_ExtensionTarget_HELPEXCOMMAND) -i $$< -o $$@ -l $(5) \
--m $$(SDF), \
+-m $$(POFILE), \
 cp $$< $$@))
 
 endef
@@ -333,10 +335,12 @@ define gb_ExtensionTarget__localize_helptreefile_onelang
 $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5).done : \
 $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3)
 ifneq ($(strip $(gb_WITH_LANG)),)
+ifneq ($(filter-out en-US,$(5)),)
 $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \
-SDF := $(gb_SDFLOCATION)$(subst $(SRCDIR),,$(subst 
$(WORKDIR)/CustomTarget,,$(2)/$(dir $(or $(4),$(3)localize.sdf
+   POFILE := $(gb_POLOCATION)/$(5)/$(subst $(SRCDIR),,$(2))/$(subst 
/$(lastword $(subst /, ,$(4))),.po,$(4))
 $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \
-$(gb_SDFLOCATION)$(subst $(SRCDIR),,$(subst 
$(WORKDIR)/CustomTarget,,$(2)/$(dir $(or $(4),$(3)localize.sdf
+$(gb_POLOCATION)/$(5)/$(subst $(SRCDIR),,$(2))/$(subst /$(lastword 
$(subst /, ,$(4))),.po,$(4))
+endif
 endif
 $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \
 $(if $(filter-out en-US,$(5)),$(gb_ExtensionTarget_UPDATETREETARGET)) 
| \
@@ -347,7 +351,7 @@ $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) 
: \
$$(call gb_Helper_abbreviate_dirs, \
 mkdir -p $$(dir $$@) && \
$(if $(filter-out en-US,$(5)), \
-   $(gb_ExtensionTarget_UPDATETREECOMMAND) $$< $(5) 
$$(SDF) $$@ $(6),\
+   cp $$< $$@,\
cp $$< $$@))
 
 endef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - RepositoryExternal.mk vcl/Library_vclplug_gtk3.mk vcl/Library_vclplug_tde.mk

[Libreoffice Gerrit user]

 RepositoryExternal.mk   |1 +
 vcl/Library_vclplug_gtk3.mk |   15 ++-
 vcl/Library_vclplug_tde.mk  |   13 +
 3 files changed, 12 insertions(+), 17 deletions(-)

New commits:
commit 398ce44c54b26b31eb826c150926fd49e59b4f52
Author: Michael Stahl 
Date:   Fri Sep 28 21:47:29 2012 +0200

RepositoryExternal: internal libpng requires zlib as well

Change-Id: Ib23b2a6bd9301a03321ddb5c8a488b579fa8d1a2

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 1196385..78e82b6 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1371,6 +1371,7 @@ define gb_LinkTarget__use_png
 $(call gb_LinkTarget_use_static_libraries,$(1),\
png \
 )
+$(call gb_LinkTarget__use_zlib,$(1))
 
 endef
 
commit bce530e89cd32d40f7a54f80906c321c5b1b944b
Author: Michael Stahl 
Date:   Fri Sep 28 21:37:26 2012 +0200

vcl: fix gtk3 build breakage due to forgotten use_libraries

Change-Id: I53faf1a5c88b6ffd954fd98814cdf27b77f1c3db

diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk
index 2c34e1d..a044723 100644
--- a/vcl/Library_vclplug_gtk3.mk
+++ b/vcl/Library_vclplug_gtk3.mk
@@ -50,8 +50,12 @@ $(eval $(call gb_Library_add_defs,vclplug_gtk3,\
 $(eval $(call gb_Library_use_sdk_api,vclplug_gtk3))
 
 $(eval $(call gb_Library_add_libs,vclplug_gtk3,\
-$$(GTK3_LIBS) \
-$$(GTHREAD_LIBS) \
+   $(GTK3_LIBS) \
+   $(GTHREAD_LIBS) \
+   -lX11 \
+   -lXext \
+   -lSM \
+   -lICE \
 ))
 
 $(eval $(call gb_Library_use_libraries,vclplug_gtk3,\
@@ -75,13 +79,6 @@ $(eval $(call gb_Library_use_externals,vclplug_gtk3,\
dbus \
 ))
 
-$(eval $(call gb_Library_use_libraries,vclplug_gtk3,\
-   -lX11 \
-   -lXext \
-   -lSM \
-   -lICE \
-))
-
 $(eval $(call gb_Library_add_exception_objects,vclplug_gtk3,\
 vcl/unx/gtk3/a11y/gtk3atkaction \
 vcl/unx/gtk3/a11y/gtk3atkbridge \
diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk
index 9431131..600f00a 100644
--- a/vcl/Library_vclplug_tde.mk
+++ b/vcl/Library_vclplug_tde.mk
@@ -45,7 +45,11 @@ $(eval $(call gb_Library_add_defs,vclplug_tde,\
 $(eval $(call gb_Library_use_sdk_api,vclplug_tde))
 
 $(eval $(call gb_Library_add_libs,vclplug_tde,\
-$$(TDE_LIBS) \
+   $(TDE_LIBS) \
+   -lX11 \
+   -lXext \
+   -lSM \
+   -lICE \
 ))
 
 $(eval $(call gb_Library_use_libraries,vclplug_tde,\
@@ -70,13 +74,6 @@ $(eval $(call gb_Library_use_externals,vclplug_tde,\
icuuc \
 ))
 
-$(eval $(call gb_Library_add_libs,vclplug_tde,\
-   -lX11 \
-   -lXext \
-   -lSM \
-   -lICE \
-))
-
 $(eval $(call gb_Library_add_exception_objects,vclplug_tde,\
 vcl/unx/kde/kdedata \
 vcl/unx/kde/salnativewidgets-kde \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

[Libreoffice Gerrit user]

 sc/source/filter/oox/defnamesbuffer.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit d3a24e566eccd7b20b893ede1b17e64e38b29be9
Author: Markus Mohrhard 
Date:   Fri Sep 28 21:01:14 2012 +0200

vba procedures and macro names will result in crash, fdo#55174

Change-Id: I23073ecc56482670d185b39452a7d8b9d6eb38c8

diff --git a/sc/source/filter/oox/defnamesbuffer.cxx 
b/sc/source/filter/oox/defnamesbuffer.cxx
index 6a3a3aa..6a62f01 100644
--- a/sc/source/filter/oox/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -426,6 +426,10 @@ DefinedName::getTokens()
 
 void DefinedName::convertFormula()
 {
+// macro function or vba procedure
+if(!mpScRangeData)
+return;
+
 // convert and set formula of the defined name
 if ( getFilterType() == FILTER_OOXML )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

LibreOffice idea or concept .

[Mariano Gaudix]

Hello   .


This ismy concept   of   graphical Interface for LibreOffice .
Written in Gtk 3.0  is  a  small  POC

Download  :  The  small  code



http://www.mediafire.com/?j50e51q0w5qb70i




see   the  POC  in youtube



http://www.youtube.com/watch?v=ctLfh7TpTOM&feature=plcp
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: 2 commits - sc/source

[Libreoffice Gerrit user]

 sc/source/filter/xml/xmlstyli.cxx |   25 -
 sc/source/filter/xml/xmlstyli.hxx |1 +
 2 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 8e94ac21b72145d59992eaee4fbbd065e597b3d6
Author: Markus Mohrhard 
Date:   Fri Sep 28 20:16:18 2012 +0200

use a as prefix for local variables

Change-Id: Id4652eb986c02044e27cd4e91863d5ed97465860

diff --git a/sc/source/filter/xml/xmlstyli.cxx 
b/sc/source/filter/xml/xmlstyli.cxx
index 2b6c58b..687c841 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -428,13 +428,13 @@ void XMLTableStyleContext::ApplyCondFormat( 
uno::SequenceGetRangeList();
 sal_uInt32 nCondId = itr->GetKey();
-size_t n = rRange.size();
+size_t n = aRangeList.size();
 for(size_t i = 0; i < n; ++i)
 {
-const ScRange* pRange = rRange[i];
+const ScRange* pRange = aRangeList[i];
 rRangeList.Join(*pRange);
 }
 
 ScPatternAttr aPattern( pDoc->GetPool() );
 aPattern.GetItemSet().Put( SfxUInt32Item( ATTR_CONDITIONAL, 
nCondId ) );
 ScMarkData aMarkData;
-aMarkData.MarkFromRangeList(rRange, true);
+aMarkData.MarkFromRangeList(aRangeList, true);
 pDoc->ApplySelectionPattern( aPattern , aMarkData);
 
 break;
@@ -469,12 +469,12 @@ void XMLTableStyleContext::ApplyCondFormat( 
uno::SequenceAddCondFormat(mpCondFormat, nTab );
 mpCondFormat->SetKey(nIndex);
-mpCondFormat->AddRange(rRange);
+mpCondFormat->AddRange(aRangeList);
 
 ScPatternAttr aPattern( pDoc->GetPool() );
 aPattern.GetItemSet().Put( SfxUInt32Item( ATTR_CONDITIONAL, nIndex ) );
 ScMarkData aMarkData;
-aMarkData.MarkFromRangeList(rRange, true);
+aMarkData.MarkFromRangeList(aRangeList, true);
 pDoc->ApplySelectionPattern( aPattern , aMarkData);
 }
 
commit c5d4e2cf96e5c28634ed6968f87b476e8a2a5850
Author: Markus Mohrhard 
Date:   Fri Sep 28 20:14:17 2012 +0200

fetime of mpCondFormat is more complex, fdo#55379

Change-Id: I2b34f9fefdfdfa245ab73f8691090cbde8bcd34e

diff --git a/sc/source/filter/xml/xmlstyli.cxx 
b/sc/source/filter/xml/xmlstyli.cxx
index a05276f..2b6c58b 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -390,12 +390,15 @@ XMLTableStyleContext::XMLTableStyleContext( ScXMLImport& 
rImport,
 nNumberFormat(-1),
 nLastSheet(-1),
 bParentSet(false),
-mpCondFormat(NULL)
+mpCondFormat(NULL),
+mbDeleteCondFormat(true)
 {
 }
 
 XMLTableStyleContext::~XMLTableStyleContext()
 {
+if(mbDeleteCondFormat)
+delete mpCondFormat;
 }
 
 SvXMLImportContext *XMLTableStyleContext::CreateChildContext(
@@ -442,11 +445,6 @@ void XMLTableStyleContext::ApplyCondFormat( 
uno::SequenceEqualEntries(*mpCondFormat))
 {
-// we don't need the new cond format entry now
-// the found one is the same and we just need to add the range to 
it
-delete mpCondFormat;
-mpCondFormat = NULL;
-
 ScRangeList& rRangeList = itr->GetRangeList();
 sal_uInt32 nCondId = itr->GetKey();
 size_t n = rRange.size();
@@ -468,6 +466,7 @@ void XMLTableStyleContext::ApplyCondFormat( 
uno::SequenceAddCondFormat(mpCondFormat, nTab );
 mpCondFormat->SetKey(nIndex);
 mpCondFormat->AddRange(rRange);
diff --git a/sc/source/filter/xml/xmlstyli.hxx 
b/sc/source/filter/xml/xmlstyli.hxx
index def3509..28ea475 100644
--- a/sc/source/filter/xml/xmlstyli.hxx
+++ b/sc/source/filter/xml/xmlstyli.hxx
@@ -101,6 +101,7 @@ class XMLTableStyleContext : public XMLPropStyleContext
 SCTAB   nLastSheet;
 boolbParentSet;
 ScConditionalFormat*mpCondFormat;
+boolmbDeleteCondFormat;
 
 const ScXMLImport& GetScImport() const { return (const 
ScXMLImport&)GetImport(); }
 ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

[Libreoffice Gerrit user]

 sc/source/filter/excel/xestyle.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit a705c6cac4182d62c3495be7367d4ae34fd47fac
Author: Noel Power 
Date:   Fri Sep 28 19:02:44 2012 +0100

halt corrupted styles with multi-saved xlsx document fdo#55418

Change-Id: I2d53c88ab121edeec2bf53f7fd177a0edcc05a25

diff --git a/sc/source/filter/excel/xestyle.cxx 
b/sc/source/filter/excel/xestyle.cxx
index a904831..339dd10 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -2235,7 +2235,10 @@ void XclExpStyle::SaveXml( XclExpXmlStream& rStrm )
 }
 else
 sName = XclXmlUtils::ToOString( maName );
-sal_Int32 nXFId = rStrm.GetRoot().GetXFBuffer().GetXmlStyleIndex( 
maXFId.mnXFId );
+// get the index in sortedlist associated with the mnXId
+sal_Int32 nXFId = rStrm.GetRoot().GetXFBuffer().GetXFIndex( maXFId.mnXFId 
);
+// get the style index associated with index into sortedlist
+nXFId = rStrm.GetRoot().GetXFBuffer().GetXmlStyleIndex( nXFId );
 rStrm.GetCurrentStream()->singleElement( XML_cellStyle,
 XML_name,   sName.getStr(),
 XML_xfId,   OString::valueOf( nXFId ).getStr(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: FDO Permissions

[bfo]

jmadero wrote
> I think that
> recognizing who is QA and who isn't will become an issue. 

Hi.
It would be possible to create QA Bugzilla group with special icon and then
add QA people as members. Icon would be displayed along Bugzilla nick then.
See 3.15.1:3 https://bugs.freedesktop.org/docs/en/html/groups.html.
Best regards.



--
View this message in context: 
http://nabble.documentfoundation.org/FDO-Permissions-tp4007909p4009925.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: FDO Permissions

[bfo]

jmadero wrote
>> My suspicion is that the other freedesktop projects would hate
>> that,
>> and that this is something that we'd need to share with them; making it
>> rather difficult to fix.

Hi.
This could be done on per project basis.  Unfortunately with

Michael Meeks wrote
> Generally we try to avoid things that
> need freedesktop's bugzilla customising specifically for our one product
> though.

attitude (and the same time paying for enabling build-in features) you can't
do much.
Best regards.



--
View this message in context: 
http://nabble.documentfoundation.org/FDO-Permissions-tp4007909p4009924.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: sc/inc sc/sdi svx/inc svx/sdi

[Libreoffice Gerrit user]

 sc/inc/sc.hrc  |9 ++-
 sc/sdi/scalc.sdi   |  120 +++
 svx/inc/svx/svxids.hrc |   16 +-
 svx/sdi/svx.sdi|  125 -
 4 files changed, 129 insertions(+), 141 deletions(-)

New commits:
commit deee6394c0db6c6ec844d2c9606b138d9bcb4672
Author: Kohei Yoshida 
Date:   Fri Sep 28 12:21:53 2012 -0400

Unwind some of the resource ID nastiness between sc and svx.

Never reference SC resource ID's in svx. That's just asking for
trouble.

Change-Id: I893de42891fbc05a2824360c52f2b74ead60f60c

diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index b5e6b8a..51cebf3 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -238,6 +238,7 @@
 #define SC_HINT_SHOWRANGEFINDER (SC_MESSAGE_START + 34)
 #define SC_HINT_DOC_SAVED   (SC_MESSAGE_START + 35)
 #define SC_HINT_FORCESETTAB (SC_MESSAGE_START + 36)
+#define SID_ENTER_STRING(SC_MESSAGE_START + 37)
 
 // messages for opening dialogs:
 #define SID_OPENDLG_CONSOLIDATE (SC_MESSAGE_START + 50)
@@ -369,13 +370,15 @@
 #define SID_TEXT_TO_COLUMNS (DATA_MENU_START + 19)
 #define SID_CONSOLIDATE (DATA_MENU_START + 20)
 #define SID_AUTOFILTER_HIDE (DATA_MENU_START + 21)
-
 #define SID_SBA_IMPORT  (DATA_MENU_START + 22)
-
 #define SID_SORT_DESCENDING (DATA_MENU_START + 23)
 #define SID_SORT_ASCENDING  (DATA_MENU_START + 24)
+#define SID_OUTLINE_HIDE(DATA_MENU_START + 25)
+#define SID_OUTLINE_SHOW(DATA_MENU_START + 26)
+#define SID_OUTLINE_MAKE(DATA_MENU_START + 27)
+#define SID_OUTLINE_REMOVE  (DATA_MENU_START + 28)
 
-#define DATA_MENU_END   (DATA_MENU_START + 25)
+#define DATA_MENU_END   (DATA_MENU_START + 29)
 
 #define TAB_POPUP_START (DATA_MENU_END)
 #define RID_POPUP_TAB   (TAB_POPUP_START)
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 451ffca..f9d7057 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -8172,3 +8172,123 @@ SfxVoidItem OpenFromCalc SID_OPEN_CALC
 ToolBoxConfig = FALSE,
 GroupId = GID_OPTIONS;
 ]
+
+SfxVoidItem ShowDetail SID_OUTLINE_SHOW
+()
+[
+/* flags: */
+AutoUpdate = FALSE,
+Cachable = Cachable,
+FastCall = FALSE,
+HasCoreId = FALSE,
+HasDialog = FALSE,
+ReadOnlyDoc = TRUE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+Synchron;
+
+/* config: */
+AccelConfig = TRUE,
+MenuConfig = TRUE,
+StatusBarConfig = FALSE,
+ToolBoxConfig = FALSE,
+GroupId = GID_DATA;
+]
+
+SfxVoidItem HideDetail SID_OUTLINE_HIDE
+()
+[
+/* flags: */
+AutoUpdate = FALSE,
+Cachable = Cachable,
+FastCall = FALSE,
+HasCoreId = FALSE,
+HasDialog = FALSE,
+ReadOnlyDoc = TRUE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+Synchron;
+
+/* config: */
+AccelConfig = TRUE,
+MenuConfig = TRUE,
+StatusBarConfig = FALSE,
+ToolBoxConfig = FALSE,
+GroupId = GID_DATA;
+]
+
+SfxVoidItem Group SID_OUTLINE_MAKE
+(SfxStringItem RowOrCol SID_OUTLINE_MAKE)
+[
+/* flags: */
+AutoUpdate = FALSE,
+Cachable = Cachable,
+FastCall = FALSE,
+HasCoreId = FALSE,
+HasDialog = TRUE,
+ReadOnlyDoc = TRUE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+Synchron;
+
+/* config: */
+AccelConfig = TRUE,
+MenuConfig = TRUE,
+StatusBarConfig = FALSE,
+ToolBoxConfig = TRUE,
+GroupId = GID_DATA;
+]
+
+SfxVoidItem Ungroup SID_OUTLINE_REMOVE
+(SfxStringItem RowOrCol SID_OUTLINE_REMOVE)
+[
+/* flags: */
+AutoUpdate = FALSE,
+Cachable = Cachable,
+FastCall = FALSE,
+HasCoreId = FALSE,
+HasDialog = TRUE,
+ReadOnlyDoc = TRUE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+Synchron;
+
+/* config: */
+AccelConfig = TRUE,
+MenuConfig = TRUE,
+StatusBarConfig = FALSE,
+ToolBoxConfig = TRUE,
+GroupId = GID_DATA;
+]
+
+SfxVoidItem EnterString SID_ENTER_STRING
+(SfxStringItem StringName SID_ENTER_STRING)
+[
+/* flags: */
+AutoUpdate = FALSE,
+Cachable = Cachable,
+FastCall = FALSE,
+HasCoreId = FALSE,
+HasDialog = FALSE,
+ReadOnlyDoc = TRUE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+Synchron;
+
+/* config: */
+AccelConfig = FALSE,
+MenuConfig = FALSE,
+StatusBarConfig = FALSE,
+ToolBoxConfig = FALSE,
+GroupId = GID_INTERN;
+]
diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc
index a932a11..8d6e56f 100644
--- a/svx/inc/svx/svxids.hrc
+++ b/svx/inc/svx/svxids.hrc
@@ -232,19 +232,6 @@
 #define ID_VAL_USEBANDINGCOLUMNSTYLE(SID_SD_START+328)
 
 // --
-// Calc-Id's
-// --

[Bug 37361] LibreOffice 3.5 most annoying bugs

[bugzilla-daemon]

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

--- Comment #384 from Lou Vaughn  ---
LibreOffice 3.5.4.2

When saving to *XML.docx (other save formats not usable),

Imported graphic image lost; but place holder remains.

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

[PATCH] Change in core[libreoffice-3-6]: rhbz#826526 Inform user about unsupported PDF encryption for...

[Stephan Bergmann (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/719

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/19/719/1

rhbz#826526 Inform user about unsupported PDF encryption formats

...with a crudely reused "Version Incompatibility" message box (TODO: improve),
rather than keeping asking for a password.

(cherry picked from commit d3d720b14c0bbfc849f8562d02b471e223e1b0bc)

Conflicts:
sdext/source/pdfimport/wrapper/wrapper.cxx

Change-Id: I8239232704a4426af7a14a729840d184a502d2df
---
M sdext/source/pdfimport/inc/pdfihelper.hxx
M sdext/source/pdfimport/inc/pdfparse.hxx
M sdext/source/pdfimport/misc/pwdinteract.cxx
M sdext/source/pdfimport/pdfparse/pdfentries.cxx
M sdext/source/pdfimport/wrapper/wrapper.cxx
5 files changed, 101 insertions(+), 38 deletions(-)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8239232704a4426af7a14a729840d184a502d2df
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Stephan Bergmann 

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

[Libreoffice-commits] .: sc/source

[Libreoffice Gerrit user]

 sc/source/filter/excel/xestyle.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 78a102e2060a1a8fc003d91fa3193b2bfa841d26
Author: Noel Power 
Date:   Fri Sep 28 16:59:02 2012 +0100

fix xlsx export missing alignment attributes with cellstyle fdo#55417

Change-Id: I510d0f399c58b5a9b192f3566e093c636cae2c0a

diff --git a/sc/source/filter/excel/xestyle.cxx 
b/sc/source/filter/excel/xestyle.cxx
index ebbe256..a904831 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -2025,7 +2025,6 @@ void XclExpXF::Init( const SfxItemSet& rItemSet, 
sal_Int16 nScript,
 GETITEMVALUE( rItemSet, SfxUInt32Item, ATTR_VALUE_FORMAT, sal_uLong ) 
: nForceScNumFmt;
 mnXclNumFmt = GetNumFmtBuffer().Insert( mnScNumFmt );
 mbFmtUsed = ScfTools::CheckItem( rItemSet, ATTR_VALUE_FORMAT, IsStyleXF() 
);
-
 // alignment
 mbAlignUsed = maAlignment.FillFromItemSet( rItemSet, bForceLineBreak, 
GetBiff(), IsStyleXF() );
 
@@ -2112,10 +2111,12 @@ void XclExpXF::SaveXml( XclExpXmlStream& rStrm )
 sax_fastparser::FSHelperPtr& rStyleSheet = rStrm.GetCurrentStream();
 
 sal_Int32 nXfId = 0;
+const XclExpXF* pStyleXF = NULL;
 if( IsCellXF() )
 {
 sal_uInt16 nXFIndex = rStrm.GetRoot().GetXFBuffer().GetXFIndex( 
mnParentXFId );
 nXfId = rStrm.GetRoot().GetXFBuffer().GetXmlStyleIndex( nXFIndex );
+pStyleXF = rStrm.GetRoot().GetXFBuffer().GetXFById( mnParentXFId );
 }
 
 rStyleSheet->startElement( XML_xf,
@@ -2135,8 +2136,13 @@ void XclExpXF::SaveXml( XclExpXmlStream& rStrm )
 FSEND );
 if( mbAlignUsed )
 maAlignment.SaveXml( rStrm );
+else if ( pStyleXF )
+pStyleXF->GetAlignmentData().SaveXml( rStrm );
 if( mbProtUsed )
 maProtection.SaveXml( rStrm );
+else if ( pStyleXF )
+pStyleXF->GetProtectionData().SaveXml( rStrm );
+
 // OOXTODO: XML_extLst
 rStyleSheet->endElement( XML_xf );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: What features of LO are non-ODFv1.2?

[Mirosław Zalewski]

On 28/09/2012 at 17:02, Miklos Vajna  wrote:

> On Fri, Sep 28, 2012 at 12:21:45AM +0200, Mirosław Zalewski 
 wrote:
> > is there any kind of documentation or other resources that points out
> > which LO capabilities are non-standard? If so, where can I find it?
> 
> In the wiki:
> 
> https://wiki.documentfoundation.org/Development/ODF_Implementer_Notes#Libre
> Office_ODF_extensions 

Thanks! That's exactly what I was looking for :) .
-- 
Best regards
Mirosław Zalewski
___
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

--- Comment #383 from Lou Vaughn  ---
LibreOffice 3.5.4.2

When saving to *XML.docx (other save formats not usable), 
Paragraph > Borders > "Spacing to Contents" 
Settings are lost (not saved, or not read on re-open?) when the document is
re-opened.

-- 
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] .: sdext/source

[Libreoffice Gerrit user]

 sdext/source/pdfimport/inc/pdfihelper.hxx  |4 +
 sdext/source/pdfimport/inc/pdfparse.hxx|3 +
 sdext/source/pdfimport/misc/pwdinteract.cxx|   41 +++-
 sdext/source/pdfimport/pdfparse/pdfentries.cxx |   15 +++--
 sdext/source/pdfimport/wrapper/wrapper.cxx |   64 ++---
 5 files changed, 95 insertions(+), 32 deletions(-)

New commits:
commit d3d720b14c0bbfc849f8562d02b471e223e1b0bc
Author: Stephan Bergmann 
Date:   Fri Sep 28 18:26:44 2012 +0200

rhbz#826526 Inform user about unsupported PDF encryption formats

...with a crudely reused "Version Incompatibility" message box (TODO: 
improve),
rather than keeping asking for a password.

Change-Id: I8239232704a4426af7a14a729840d184a502d2df

diff --git a/sdext/source/pdfimport/inc/pdfihelper.hxx 
b/sdext/source/pdfimport/inc/pdfihelper.hxx
index d8f7d3c..ad4774a 100644
--- a/sdext/source/pdfimport/inc/pdfihelper.hxx
+++ b/sdext/source/pdfimport/inc/pdfihelper.hxx
@@ -196,6 +196,10 @@ namespace pdfi
   bool 
bFirstTry,
   const rtl::OUString& 
rDocName
   );
+
+void reportUnsupportedEncryptionFormat(
+com::sun::star::uno::Reference<
+com::sun::star::task::XInteractionHandler > const & handler);
 }
 
 #define USTR(x) rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( x ) )
diff --git a/sdext/source/pdfimport/inc/pdfparse.hxx 
b/sdext/source/pdfimport/inc/pdfparse.hxx
index df3e425..5e87b89 100644
--- a/sdext/source/pdfimport/inc/pdfparse.hxx
+++ b/sdext/source/pdfimport/inc/pdfparse.hxx
@@ -253,6 +253,9 @@ struct PDFFile : public PDFContainer
 virtual PDFEntry* clone() const;
 
 bool isEncrypted() const;
+
+bool usesSupportedEncryptionFormat() const;
+
 // this method checks whether rPwd is compatible with
 // either user or owner password and sets up decrypt data in that case
 // returns true if decryption can be done
diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx 
b/sdext/source/pdfimport/misc/pwdinteract.cxx
index e5fb674..81cdcb8 100644
--- a/sdext/source/pdfimport/misc/pwdinteract.cxx
+++ b/sdext/source/pdfimport/misc/pwdinteract.cxx
@@ -26,9 +26,14 @@
  *
  /
 
+#include "sal/config.h"
+
+#include 
 
 #include "pdfihelper.hxx"
 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -36,8 +41,9 @@
 
 #include 
 #include 
+#include 
 #include 
-
+#include 
 
 using namespace com::sun::star;
 
@@ -125,6 +131,32 @@ void SAL_CALL PDFPasswordRequest::select() throw 
(uno::RuntimeException)
 m_bSelected = true;
 }
 
+class UnsupportedEncryptionFormatRequest:
+public cppu::WeakImplHelper1< task::XInteractionRequest >,
+private boost::noncopyable
+{
+public:
+UnsupportedEncryptionFormatRequest() {}
+
+private:
+virtual ~UnsupportedEncryptionFormatRequest() {}
+
+virtual uno::Any SAL_CALL getRequest() throw (uno::RuntimeException) {
+return uno::makeAny(
+task::ErrorCodeRequest(
+OUString(), uno::Reference< uno::XInterface >(),
+ERRCODE_IO_WRONGVERSION));
+//TODO: should be something more informative than crudely reused
+// ERRCODE_IO_WRONGVERSION
+}
+
+virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > >
+SAL_CALL getContinuations() throw (uno::RuntimeException) {
+return
+uno::Sequence< uno::Reference< task::XInteractionContinuation > 
>();
+}
+};
+
 } // namespace
 
 namespace pdfi
@@ -159,6 +191,13 @@ bool getPassword( const uno::Reference< 
task::XInteractionHandler >& xHandler,
 return bSuccess;
 }
 
+void reportUnsupportedEncryptionFormat(
+uno::Reference< task::XInteractionHandler > const & handler)
+{
+assert(handler.is());
+handler->handle(new UnsupportedEncryptionFormatRequest);
+}
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx 
b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
index 259d700..9a78554 100644
--- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
@@ -1224,17 +1224,22 @@ static bool check_user_password( const OString& rPwd, 
PDFFileImplData* pData )
 return bValid;
 }
 
+bool PDFFile::usesSupportedEncryptionFormat() const
+{
+return m_pData->m_bStandardHandler &&
+m_pData->m_nAlgoVersion >= 1 &&
+m_pData->m_nAlgoVersion <= 2 &&
+m_pData->m_nStandardRevision >= 2 &&
+m_pData->m_nStandardRevision <= 3;
+}
+
 bool PDFFile::setupDecryptionData( const OString& rPwd ) const
 {
 if( !impl_getData()->m_bIsEncrypted )
 return rPwd.isEmpty();
 
 // check if we can handle this encryption at all
-if( ! m_pData->m_bStandardHandler ||
-m_pData->m_nAlgoVersio

[Libreoffice-commits] .: svx/Library_svx.mk

[Libreoffice Gerrit user]

 svx/Library_svx.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 050d74b558f896ab510a31bcffde2e0346fc5bd8
Author: Michael Stahl 
Date:   Fri Sep 28 18:18:36 2012 +0200

another oops in svx...

Change-Id: I0f9de9ed23d160a8c3cf6a9db8eece95b4e8795a

diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index 6ccba76..26acd01 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -221,7 +221,7 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
 ))
 else
 ifeq ($(OS),WNT)
-$(eval $(call gb_Library_use_libraries,svx,\
+$(eval $(call gb_Library_use_system_win32_libs,svx,\
 advapi32 \
 ))
 $(eval $(call gb_Library_add_exception_objects,svx,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: graphite/README

[Libreoffice Gerrit user]

 graphite/README |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9024006206451518712ada0d2007397c5d9e6c28
Author: Takeshi Abe 
Date:   Sat Sep 29 01:13:00 2012 +0900

The graphite page was moved

Change-Id: I99bc4cd9e600dc0b2e9f74fba7615c6677cf90ca

diff --git a/graphite/README b/graphite/README
index 1cdf775..aac0d0d 100644
--- a/graphite/README
+++ b/graphite/README
@@ -1,4 +1,4 @@
 Library for providing rendering capabilities for complex non-Roman writing 
systems.
 
 From:
-[http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&cat_id=RenderingGraphite]
+[http://graphite.sil.org/]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 5 commits - sc/inc sc/source

[Libreoffice Gerrit user]

 sc/inc/rangelst.hxx   |1 
 sc/source/core/tool/rangelst.cxx  |   15 +++
 sc/source/ui/condformat/condformatdlg.cxx |   39 +-
 sc/source/ui/condformat/condformatmgr.cxx |6 +++-
 sc/source/ui/inc/condformatmgr.hxx|1 
 sc/source/ui/view/cellsh1.cxx |4 +--
 6 files changed, 41 insertions(+), 25 deletions(-)

New commits:
commit 9edb6ba992ad2ef092996903d775df5313613bee
Author: Markus Mohrhard 
Date:   Fri Sep 28 18:09:43 2012 +0200

add the remaining parts to previous commit

Change-Id: Ia0b9ed9eed30991f38234bf56c49b26392491f30

diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index a1cdc8c..e9211c1 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -2061,11 +2061,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
 const ScConditionalFormat* pCondFormat = 
pDoc->GetCondFormat(aPos.Col(), aPos.Row(), aPos.Tab());
 if(pCondFormat)
 {
-pDlg = pFact->CreateScCondFormatDlg( 
pTabViewShell->GetDialogParent(), pDoc, pCondFormat, pCondFormat->GetRange(), 
aPos, RID_SCDLG_CONDFORMAT );
+pDlg = pFact->CreateScCondFormatDlg( 
pTabViewShell->GetDialogParent(), pDoc, pCondFormat, pCondFormat->GetRange(), 
pCondFormat->GetRange().GetTopLeftCorner(), RID_SCDLG_CONDFORMAT );
 }
 else
 {
-pDlg = pFact->CreateScCondFormatDlg( 
pTabViewShell->GetDialogParent(), pDoc, NULL, aRangeList, aPos, 
RID_SCDLG_CONDFORMAT );
+pDlg = pFact->CreateScCondFormatDlg( 
pTabViewShell->GetDialogParent(), pDoc, NULL, aRangeList, 
aRangeList.GetTopLeftCorner(), RID_SCDLG_CONDFORMAT );
 }
 
 if(pDlg->Execute() == RET_OK)
commit 985e7e4f5017b67f2734b8885d81e32e2011e470
Author: Michael Meeks 
Date:   Fri Sep 28 13:40:47 2012 +0100

fdo#54940 - make editing relative refs more intuitive to me

Change-Id: Ib7681de7b1aad9b6dda183e3c4fa1b1010270d3f

diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx
index 74bb7be..8bf3bed 100644
--- a/sc/inc/rangelst.hxx
+++ b/sc/inc/rangelst.hxx
@@ -81,6 +81,7 @@ public:
 boolIntersects( const ScRange& ) const;
 boolIn( const ScRange& ) const;
 size_t  GetCellCount() const;
+ScAddress   GetTopLeftCorner() const;
 
 ScRange*Remove(size_t nPos);
 voidRemoveAll();
diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx
index c9c4c3e..b7347f6 100644
--- a/sc/source/core/tool/rangelst.cxx
+++ b/sc/source/core/tool/rangelst.cxx
@@ -1145,6 +1145,21 @@ void ScRangeList::push_back(ScRange* p)
 maRanges.push_back(p);
 }
 
+ScAddress ScRangeList::GetTopLeftCorner() const
+{
+if(empty())
+return ScAddress();
+
+ScAddress aAddr = maRanges[0]->aStart;
+for(size_t i = 1, n = size(); i < n; ++i)
+{
+if(maRanges[i]->aStart < aAddr)
+aAddr = maRanges[i]->aStart;
+}
+
+return aAddr;
+}
+
 // === ScRangePairList 
 
 ScRangePairList::~ScRangePairList()
diff --git a/sc/source/ui/condformat/condformatmgr.cxx 
b/sc/source/ui/condformat/condformatmgr.cxx
index b40a523..62b1fdc 100644
--- a/sc/source/ui/condformat/condformatmgr.cxx
+++ b/sc/source/ui/condformat/condformatmgr.cxx
@@ -77,7 +77,7 @@ String ScCondFormatManagerWindow::createEntryString(const 
ScConditionalFormat& r
 String aStr;
 aRange.Format(aStr, SCA_VALID, mpDoc, mpDoc->GetAddressConvention());
 aStr += '\t';
-aStr += ScCondFormatHelper::GetExpression(rFormat, mrPos);
+aStr += ScCondFormatHelper::GetExpression(rFormat, 
aRange.GetTopLeftCorner());
 return aStr;
 }
 
@@ -209,7 +209,8 @@ IMPL_LINK_NOARG(ScCondFormatManagerDlg, EditBtnHdl)
 if(!pFormat)
 return 0;
 
-ScCondFormatDlg* pDlg = new ScCondFormatDlg(this, mpDoc, pFormat, 
pFormat->GetRange(), maPos);
+ScCondFormatDlg* pDlg = new ScCondFormatDlg(this, mpDoc, pFormat, 
pFormat->GetRange(),
+
pFormat->GetRange().GetTopLeftCorner());
 if(pDlg->Execute() == RET_OK)
 {
 sal_Int32 nKey = pFormat->GetKey();
commit 5f32a4a2a18b1726c8bb7a5ce694648b0d8aba31
Author: Michael Meeks 
Date:   Fri Sep 28 13:38:52 2012 +0100

double-click on a conditional format inspects / edits it.

Change-Id: Icdfeae938627b63decd26571e86bc1e80e07f6c6

diff --git a/sc/source/ui/condformat/condformatmgr.cxx 
b/sc/source/ui/condformat/condformatmgr.cxx
index ebaad9b..b40a523 100644
--- a/sc/source/ui/condformat/condformatmgr.cxx
+++ b/sc/source/ui/condformat/condformatmgr.cxx
@@ -180,6 +180,7 @@ ScCondFormatManagerDlg::ScCondFormatManagerDlg(Window* 
pParent, ScDocument* pDoc
 
 maBtnRemove.SetClickHdl(LINK(this, ScCondFormatManagerDl

[Libreoffice-commits] .: sw/qa

[Libreoffice Gerrit user]

 sw/qa/extras/rtfimport/rtfimport.cxx |   56 ++-
 1 file changed, 10 insertions(+), 46 deletions(-)

New commits:
commit 9cce64934020576013ee03c3888a696a98d069de
Author: Miklos Vajna 
Date:   Fri Sep 28 18:05:28 2012 +0200

sw/qa: more getProperty() usage in extras

Change-Id: Ic4782f3d315b6ef860153fdeb1890bba083f9630

diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 68401dd..96503a7 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -199,19 +199,9 @@ void Test::testFdo45553()
 uno::Reference xRange(xRangeEnum->nextElement(), 
uno::UNO_QUERY);
 OUString aStr = xRange->getString();
 if ( aStr == "space-before" )
-{
-sal_Int32 nMargin = 0;
-uno::Reference xPropertySet(xRange, 
uno::UNO_QUERY);
-xPropertySet->getPropertyValue("ParaTopMargin") >>= nMargin;
-CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(120)), nMargin);
-}
+CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(120)), 
getProperty(xRange, "ParaTopMargin"));
 else if ( aStr == "space-after" )
-{
-sal_Int32 nMargin = 0;
-uno::Reference xPropertySet(xRange, 
uno::UNO_QUERY);
-xPropertySet->getPropertyValue("ParaBottomMargin") >>= nMargin;
-CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(240)), nMargin);
-}
+CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(240)), 
getProperty(xRange, "ParaBottomMargin"));
 }
 }
 }
@@ -249,12 +239,8 @@ void Test::testN695479()
 uno::Reference 
xPropertySet(xIndexAccess->getByIndex(0), uno::UNO_QUERY);
 
 // Negative ABSH should mean fixed size.
-sal_Int16 nSizeType = 0;
-xPropertySet->getPropertyValue("SizeType") >>= nSizeType;
-CPPUNIT_ASSERT_EQUAL(text::SizeType::FIX, nSizeType);
-sal_Int32 nHeight = 0;
-xPropertySet->getPropertyValue("Height") >>= nHeight;
-CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(300)), nHeight);
+CPPUNIT_ASSERT_EQUAL(text::SizeType::FIX, 
getProperty(xPropertySet, "SizeType"));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(300)), 
getProperty(xPropertySet, "Height"));
 
 uno::Reference xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
 uno::Reference 
xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY);
@@ -272,24 +258,16 @@ void Test::testN695479()
 CPPUNIT_ASSERT_EQUAL(OUString("plain"), xText->getString());
 
 if (i == 0)
-{
 // Additonally, the frist frame should have double border at 
the bottom.
-table::BorderLine2 aBorder;
-xPropertySet->getPropertyValue("BottomBorder") >>= aBorder;
-CPPUNIT_ASSERT_EQUAL(table::BorderLineStyle::DOUBLE, 
aBorder.LineStyle);
-}
+CPPUNIT_ASSERT_EQUAL(table::BorderLineStyle::DOUBLE, 
getProperty(xPropertySet, "BottomBorder").LineStyle);
 }
 else if 
(xServiceInfo->supportsService("com.sun.star.drawing.LineShape"))
 {
 // The older "drawing objects" syntax should be recognized.
 bDrawFound = true;
 xPropertySet.set(xServiceInfo, uno::UNO_QUERY);
-sal_Int16 nHori = 0;
-xPropertySet->getPropertyValue("HoriOrientRelation") >>= nHori;
-CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_PRINT_AREA, nHori);
-sal_Int16 nVert = 0;
-xPropertySet->getPropertyValue("VertOrientRelation") >>= nVert;
-CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME, nVert);
+CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_PRINT_AREA, 
getProperty(xPropertySet, "HoriOrientRelation"));
+CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME, 
getProperty(xPropertySet, "VertOrientRelation"));
 }
 }
 CPPUNIT_ASSERT(bFrameFound);
@@ -311,13 +289,7 @@ void Test::testFdo45187()
 // There should be two shapes.
 CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xDraws->getCount());
 // They should be anchored to different paragraphs.
-uno::Reference xPropertySet(xDraws->getByIndex(0), 
uno::UNO_QUERY);
-awt::Point aFirstPoint;
-xPropertySet->getPropertyValue("AnchorPosition") >>= aFirstPoint;
-xPropertySet.set(xDraws->getByIndex(1), uno::UNO_QUERY);
-awt::Point aSecondPoint;
-xPropertySet->getPropertyValue("AnchorPosition") >>= aSecondPoint;
-CPPUNIT_ASSERT(aFirstPoint.Y != aSecondPoint.Y);
+CPPUNIT_ASSERT(getProperty(xDraws->getByIndex(0), 
"AnchorPosition").Y != getProperty(xDraws->getByIndex(1), 
"AnchorPosition").Y);
 }
 
 void Test::testFdo46662()
@@ -334,17 +306,9 @@ void Test::testFdo46662()
 const beans::PropertyValue& rProp = aProps[i];
 
 if ( rProp.Name == "ParentNumbering" )
-{
-sal_Int16 nVal

[Libreoffice-commits] .: basic/Library_sb.mk

[Libreoffice Gerrit user]

 basic/Library_sb.mk |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 93a118d728736a9ffb6269b2816d4a1428472baa
Author: Michael Stahl 
Date:   Fri Sep 28 17:57:08 2012 +0200

fix WNT build: missed one oleaut32

Change-Id: Ic079200f6a3f1a1e7ac38f971e4da40a8dd39dd0

diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index 457a52b..73eb631 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -138,8 +138,7 @@ $(eval $(call gb_Library_add_exception_objects,sb,\
 ))
 
 ifeq ($(GUI),WNT)
-$(eval $(call gb_Library_use_libraries,sb,\
-   uwinapi \
+$(eval $(call gb_Library_use_system_win32_libs,sb,\
oleaut32 \
 ))
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: clucene/Library_clucene.mk

[Libreoffice Gerrit user]

 clucene/Library_clucene.mk |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 23126cea9ed09389da9714cd6f0982822aa9805d
Author: Norbert Thiebaud 
Date:   Fri Sep 28 10:15:33 2012 -0500

hide clucene warnings under the carpet to avoid poluting make's output

Change-Id: I1f6e4d187ae6200fe1d2444c07af9ca42a010bc1

diff --git a/clucene/Library_clucene.mk b/clucene/Library_clucene.mk
index 16bfbd5..72a1dcc 100644
--- a/clucene/Library_clucene.mk
+++ b/clucene/Library_clucene.mk
@@ -50,6 +50,12 @@ $(eval $(call gb_Library_add_defs,clucene,\
 $(LFS_CFLAGS) \
 ))
 
+# clucene is riddled with warnings... let's spare use
+# the pointless spamming
+$(eval $(call gb_Library_add_cxxflags,clucene,\
+   -w \
+))
+
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Library_add_libs,clucene,\
-lm \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: What features of LO are non-ODFv1.2?

[Michael Stahl]

On 28/09/12 16:27, Tor Lillqvist wrote:
>> They may not display documents written in LO exactly the same as LO does,
>> because they are free to ignore properties that makes "Extended" part.
> 
> Surely any ODF imlementation is free to *display* documents however it
> wishes, even if it would implement  (in the sense of "round-trip") the
> document exactly. The *rendering* is completely unspecified by ODF,
> isn't it?

rendering is quite constrained by the ODF spec but there are still some
undefined areas; especially how an ODF consumer should handle
contradictory constraints is not specified at all, things like what
should we do with a table width of 10cm with 4 rows that are 5cm wide each.

also there are things that affect rendering that are not obvious, for
example having a hyphenation extension for the document language
installed or not (or just one that does hyphenation differently) may
have an effect on the layout.

> If you want a standardized rendering, you need to look at some other
> format, like PDF perhaps? Or TeX ;)

yes PDF will certainly have the highest layout fidelity. that goes hand
in hand with it being not easily editable :)

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

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

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

Bug 6 depends on bug 55059, which changed state.

Bug 55059 Summary: EDITING: Calculate formula
https://bugs.freedesktop.org/show_bug.cgi?id=55059

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution|--- |FIXED

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

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

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

Bug 6 depends on bug 55059, which changed state.

Bug 55059 Summary: EDITING: Calculate formula
https://bugs.freedesktop.org/show_bug.cgi?id=55059

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|FIXED   |---

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

Re: What features of LO are non-ODFv1.2?

[Miklos Vajna]

On Fri, Sep 28, 2012 at 12:21:45AM +0200, Mirosław Zalewski 
 wrote:
> is there any kind of documentation or other resources that points out which 
> LO 
> capabilities are non-standard? If so, where can I find it?

In the wiki:

https://wiki.documentfoundation.org/Development/ODF_Implementer_Notes#LibreOffice_ODF_extensions
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: OUString is mutable?

[Noel Grandin]

On 2012-09-28 16:46, Norbert Thiebaud wrote:

On Fri, Sep 28, 2012 at 9:05 AM, Noel Grandin  wrote:

If you tell me that the saving from not having the nCapacity field is the
motivation, then I get understand, but then we should update the docs to
reflect that fact, rather than pretending that OUString is immutable.

>From what I gathered: the thing pointed to by OUString _is_ immutable
but you can make a OUString point to another 'immutable content'.
iow it is not OUString that is immutable... but it's 'payload'.

I may be wrong, but I assume that the reason OUString is like that is
not just to save a nCapacity... but also because there are assumption
you can make if that property is true (that OUString only point to
immutable data, regarding memory allocation, copy, clone etc...




If that's the case, then we could steal a bit somewhere to indicate that 
the payload is immutable, and have all of those optimisations without 
needing to create a whole separate OUStringBuffer class.




Disclaimer: http://www.peralex.com/disclaimer.html


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

Re: OUString is mutable?

[Norbert Thiebaud]

On Fri, Sep 28, 2012 at 9:05 AM, Noel Grandin  wrote:
> If you tell me that the saving from not having the nCapacity field is the
> motivation, then I get understand, but then we should update the docs to
> reflect that fact, rather than pretending that OUString is immutable.

>From what I gathered: the thing pointed to by OUString _is_ immutable
but you can make a OUString point to another 'immutable content'.
iow it is not OUString that is immutable... but it's 'payload'.

I may be wrong, but I assume that the reason OUString is like that is
not just to save a nCapacity... but also because there are assumption
you can make if that property is true (that OUString only point to
immutable data, regarding memory allocation, copy, clone etc...

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

Re: OUString is mutable?

[Michael Stahl]

On 28/09/12 16:05, Noel Grandin wrote:
> 
> On 2012-09-28 16:00, Caolán McNamara wrote:
>> On Fri, 2012-09-28 at 14:17 +0200, Noel Grandin wrote:
>>> you can do this:
>>>
>>>   void f(OUString s) {
>>>s = "2";
>>>   }
>>>
>>>   OUString s = "1";
>>>   f(s);
>>>   cout << s; // will print "2"
>> That will print "1" not "2".
>>
>> Maybe you meant
>>
>> void f(OUString& s) {
>>s = "2";
>> }
>>
>> OUString s = "1";
>> f(s);
>> cout << s; // will print "2"
>>
>> but that's perfectly reasonable.
>>
>> C.
>>
> 
> 
> Yeah, that's what I meant.
> But that's also what I have a problem with.
> It means that any OUString field or variable is effectively mutable, 

i don't see how that is the case.  the calling code needs to explicitly
pass the string as a parameter to a function for it to be modified, and
it's clear from the parameter non-const reference type that this can
happen.  you can also pass an ordinary pointer by-reference and then the
called function can reset it to a different value, that is just how C++
works...:

void f(void *& p) {
p = (void*)42;
}

for comparison, in Java you cannot do this directly (because Java does
not have call-by-reference semantics, only call-by-value), you have to
wrap the string in e.g. an array to get something similar:

void f(String[] s) {
s[0] = "bar";
}


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

Re: OUString is mutable?

[Norbert Thiebaud]

On Fri, Sep 28, 2012 at 8:58 AM, Noel Grandin  wrote:
> Sorry, that example code should read (note that the parameter is now a
> reference param)
>
> void f(OUString & s) {
>
>  s = "2";
> }
>
> OUString s = "1";
> f(s);
> cout << s; // will print "2"
>

ah!! then, that's pretty much 'normal'... no surprise there.


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

Re: What features of LO are non-ODFv1.2?

[Tor Lillqvist]

> They may not display documents written in LO exactly the same as LO does,
> because they are free to ignore properties that makes "Extended" part.

Surely any ODF imlementation is free to *display* documents however it
wishes, even if it would implement  (in the sense of "round-trip") the
document exactly. The *rendering* is completely unspecified by ODF,
isn't it?

If you want a standardized rendering, you need to look at some other
format, like PDF perhaps? Or TeX ;)

Or then I am on crack, and you can ignore me.

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

Re: OUString is mutable?

[Noel Grandin]

On 2012-09-28 16:00, Caolán McNamara wrote:

On Fri, 2012-09-28 at 14:17 +0200, Noel Grandin wrote:

you can do this:

  void f(OUString s) {
   s = "2";
  }

  OUString s = "1";
  f(s);
  cout << s; // will print "2"

That will print "1" not "2".

Maybe you meant

void f(OUString& s) {
   s = "2";
}

OUString s = "1";
f(s);
cout << s; // will print "2"

but that's perfectly reasonable.

C.




Yeah, that's what I meant.
But that's also what I have a problem with.
It means that any OUString field or variable is effectively mutable, 
which makes the difference between it and OUStringBuffer boil down to 
the presence of the nCapacity field.


If you tell me that the saving from not having the nCapacity field is 
the motivation, then I get understand, but then we should update the 
docs to reflect that fact, rather than pretending that OUString is 
immutable.


Disclaimer: http://www.peralex.com/disclaimer.html


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

Re: OUString is mutable?

[Caolán McNamara]

On Fri, 2012-09-28 at 14:17 +0200, Noel Grandin wrote:
> you can do this:
> 
>  void f(OUString s) {
>   s = "2";
>  }
> 
>  OUString s = "1";
>  f(s);
>  cout << s; // will print "2"

That will print "1" not "2".

Maybe you meant

void f(OUString& s) {
  s = "2"; 
} 

OUString s = "1";
f(s);
cout << s; // will print "2"

but that's perfectly reasonable.

C.

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

Re: OUString is mutable?

[Noel Grandin]

On 2012-09-28 15:55, Norbert Thiebaud wrote:

On Fri, Sep 28, 2012 at 7:17 AM, Noel Grandin  wrote:

That is exactly what makes it weird - it looks like a Java String, but it's
not, because you can do this:

 void f(OUString s) {
  s = "2";
 }

 OUString s = "1";
 f(s);
 cout << s; // will print "2"

ie. the modification inside the method is visible outside the method.

Really ? it does that ?
Whoaa, that is unexpected, and way wrong. That should be considered
'entrapment' :-/

Norbert




Sorry, that example code should read (note that the parameter is now a 
reference param)


void f(OUString & s) {
 s = "2";
}

OUString s = "1";
f(s);
cout << s; // will print "2"



Disclaimer: http://www.peralex.com/disclaimer.html


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

Re: OUString is mutable?

[Norbert Thiebaud]

On Fri, Sep 28, 2012 at 7:17 AM, Noel Grandin  wrote:
> That is exactly what makes it weird - it looks like a Java String, but it's
> not, because you can do this:
>
> void f(OUString s) {
>  s = "2";
> }
>
> OUString s = "1";
> f(s);
> cout << s; // will print "2"
>
> ie. the modification inside the method is visible outside the method.

Really ? it does that ?
Whoaa, that is unexpected, and way wrong. That should be considered
'entrapment' :-/

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

Re: OUString is mutable?

[Noel Grandin]

On 2012-09-28 15:37, Michael Meeks wrote:

Hi Noel,

On Fri, 2012-09-28 at 14:17 +0200, Noel Grandin wrote:

It just seems to me that we could easily enough steal a bit from the
length field to indicate that the buffer is immutable, and then we could
reduce our complexity by eliminating OUStringBuffer.

We already steal bits from the ref-count for magic like this: static
strings, and interned strings ;-)

The question is - would it be more obvious if:

void method(rtl::OUString &rFoo, rtl::OUString &rBaa)
{
rFoo += "foo"; // no exception it's mutable.
rBaa += "baa"; // exception because it's immutable.
}

:-) i assume not. OTOH - I too am not a huge fan of the sal string
classes for general usability - but I've not done a ton of work with
them recently to be fair.



So that idea is workable - great.

In your example, it wouldn't throw an exception, it would simply notice 
that it's internal buffer was immutable, allocate a new buffer, and 
append the string to that.


I'm asking because I'm starting to do XubString/UniString -> OUString 
cleanup work, and the work would be a lot simpler if we only had one 
target  - OUString.




Disclaimer: http://www.peralex.com/disclaimer.html


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

Re: need help with unit test and process service factory

[Michael Meeks]

On Fri, 2012-09-28 at 09:35 +0200, Miklos Vajna wrote:
> commit 49cec3fa6f25cdf2f24602696b6a94570cbbfc2f added a libreoffice user
> profile for unit tests. Couldn't be a similar empathy profile added for
> the tubes test?

And require empathy + telepathy of a certain version to be installed on
the tinderbox machine (and each builder's machine?), and presumably a
jabber server setup and running and ...

IMHO it would be better to write unit tests to test the protocol
fragments we get out of the calc core, and ensure that these continue to
work nicely :-) "run a stream of commands" "save document" "diff output"
etc.

I love unit tests more than most, but - there are some limits to the
harnesses people can easily construct out there.

Of course - if we had a small / fall-back TCP / local socket version we
could do some testing via that but ... it's not really going to test
much more than the above is it ?

ATB,

Michael.

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

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

Re: OUString is mutable?

[Michael Meeks]

Hi Noel,

On Fri, 2012-09-28 at 14:17 +0200, Noel Grandin wrote:
> It just seems to me that we could easily enough steal a bit from the 
> length field to indicate that the buffer is immutable, and then we could 
> reduce our complexity by eliminating OUStringBuffer.

We already steal bits from the ref-count for magic like this: static
strings, and interned strings ;-)

The question is - would it be more obvious if:

void method(rtl::OUString &rFoo, rtl::OUString &rBaa)
{
rFoo += "foo"; // no exception it's mutable.
rBaa += "baa"; // exception because it's immutable.
}

:-) i assume not. OTOH - I too am not a huge fan of the sal string
classes for general usability - but I've not done a ton of work with
them recently to be fair.

ATB,

Michael.

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

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

What features of LO are non-ODFv1.2?

[Mirosław Zalewski]

Hi

As we all know, LibreOffice default file format is ODFv1.2 Extended, which is 
correct ODFv1.2 with some non-standard extensions.

If we are talking about document interoperability, we can reasonably assume 
that other applications try to comply with ODFv1.2, as published by OASIS. 
They may not display documents written in LO exactly the same as LO does, 
because they are free to ignore properties that makes "Extended" part.

My question is:
is there any kind of documentation or other resources that points out which LO 
capabilities are non-standard? If so, where can I find it?
Or do I have to go through LO release notes and for each new feature check if 
it exists in ODFv1.2 specification?

It would be very useful for me (and perhaps other users), because I would like 
to know which functions that I use are not interchangeable with other ODF-
compliant applications.

Thanks in advance
-- 
Best regards
Mirosław Zalewski
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[ANN] LibreOffice 3.6.2 RC2 available

[Thorsten Behrens]

Dear Community,

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

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

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

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

  https://bugs.freedesktop.org

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

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

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

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

translate LibreOffice to your language:

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

or help with funding our operations:

  http://donate.libreoffice.org/

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

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

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

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

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

Yours,

The Document Foundation Board of Directors

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


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

Re: OUString is mutable?

[Noel Grandin]

On 2012-09-28 14:09, Michael Stahl wrote:

On 28/09/12 13:46, Noel Grandin wrote:

Hi

I don't really understand the point of not being able to mutate OUString
in-place, but being able to overwrite it via the assignment operator?

It seems to me it should be one or the other.
Either OUString is immutable, and it cannot be assigned to, except via a
constructor, or it is mutable, and we can pretty much throw away
OUStringBuffer.

[accidentally sent this first to Noel only instead of the list]

the point you are missing is that OUString is a sort of "smart pointer"
to an immutable buffer.  it works similarly to "String" in Java, e.g. in
Java "String s = "foo"; s = "bar"" is legal but you cannot modify the
content of whatever value is assigned to "s".

that's why OUString has an operator= that makes it point at a different
buffer but offers no way to write into the buffer (at least i hope it
doesn't...).





That is exactly what makes it weird - it looks like a Java String, but 
it's not, because you can do this:


void f(OUString s) {
 s = "2";
}

OUString s = "1";
f(s);
cout << s; // will print "2"

ie. the modification inside the method is visible outside the method.

Also, in Java, this
   String s = "1";
is really syntactic sugar for this:
   String s = new String("1");
So it's not a real assignment operation.

It just seems to me that we could easily enough steal a bit from the 
length field to indicate that the buffer is immutable, and then we could 
reduce our complexity by eliminating OUStringBuffer.



Disclaimer: http://www.peralex.com/disclaimer.html


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

[Libreoffice-commits] .: Branch 'feature/killsdf' - 2 commits - dictionaries/Dictionary_pt-BR.mk dictionaries/Dictionary_pt.mk dictionaries/Dictionary_pt-pt.mk dictionaries/Dictionary_pt-PT.mk diction

[Libreoffice Gerrit user]

 dictionaries/Dictionary_pt-BR.mk   |   21 +
 dictionaries/Dictionary_pt-PT.mk   |   26 +
 dictionaries/Dictionary_pt-pt.mk   |   26 -
 dictionaries/Dictionary_pt.mk  |   21 -
 dictionaries/Module_dictionaries.mk|4 +-
 dictionaries/hu_HU/pythonpath/lightproof_impl_hu_HU.py |2 -
 6 files changed, 50 insertions(+), 50 deletions(-)

New commits:
commit 48ab525dcfd6451fa2f3e37e92bd60f3885c47f7
Author: László Németh 
Date:   Tue Sep 18 16:04:30 2012 +0200

fix suggest() splitting in some optional Hungarian grammar checking rules

Change-Id: I3c73f1c6c138a7c70cd8d25c6031d90779d5c543

diff --git a/dictionaries/hu_HU/pythonpath/lightproof_impl_hu_HU.py 
b/dictionaries/hu_HU/pythonpath/lightproof_impl_hu_HU.py
index afbde77..f122057 100644
--- a/dictionaries/hu_HU/pythonpath/lightproof_impl_hu_HU.py
+++ b/dictionaries/hu_HU/pythonpath/lightproof_impl_hu_HU.py
@@ -119,7 +119,7 @@ def suggest(rLoc, word):
 if not x:
 return word
 t = x.getAlternatives()
-suggestions[word] = join(t, "\\n")
+suggestions[word] = join(t, "|")
 return suggestions[word]
 
 # get the nth word of the input string or None
commit d1f69e800560a558f9dbffc195573d32354e8efb
Author: Olivier Hallot 
Date:   Sun Sep 9 07:48:00 2012 -0300

Fix for fdo#53520, Portuguese spelling files

Change-Id: I95cb422412de5f36416e6aaeb1663c39773ffb7c

diff --git a/dictionaries/Dictionary_pt-BR.mk b/dictionaries/Dictionary_pt-BR.mk
new file mode 100644
index 000..82b425e
--- /dev/null
+++ b/dictionaries/Dictionary_pt-BR.mk
@@ -0,0 +1,21 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Dictionary_Dictionary,dict-pt-BR,dictionaries/pt_BR))
+
+$(eval $(call gb_Dictionary_add_root_files,dict-pt-BR,\
+   dictionaries/pt_BR/hyph_pt_BR.dic \
+   dictionaries/pt_BR/pt_BR.aff \
+   dictionaries/pt_BR/pt_BR.dic \
+   dictionaries/pt_BR/README_en.txt \
+   dictionaries/pt_BR/README_hyph_pt_BR.txt \
+   dictionaries/pt_BR/README_pt_BR.txt \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/dictionaries/Dictionary_pt-PT.mk b/dictionaries/Dictionary_pt-PT.mk
new file mode 100644
index 000..9e023be
--- /dev/null
+++ b/dictionaries/Dictionary_pt-PT.mk
@@ -0,0 +1,26 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Dictionary_Dictionary,dict-pt-PT,dictionaries/pt_PT))
+
+$(eval $(call gb_Dictionary_add_root_files,dict-pt-PT,\
+   dictionaries/pt_PT/hyph_pt_PT.dic \
+   dictionaries/pt_PT/LICENSES.txt \
+   dictionaries/pt_PT/pt_PT.aff \
+   dictionaries/pt_PT/pt_PT.dic \
+   dictionaries/pt_PT/README_hyph_pt_PT.txt \
+   dictionaries/pt_PT/README_pt_PT.txt \
+   dictionaries/pt_PT/README_th_pt_PT_v2.txt \
+))
+
+$(eval $(call gb_Dictionary_add_thesauri,dict-pt-PT,\
+   dictionaries/pt_PT/th_pt_PT_v2.dat \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/dictionaries/Dictionary_pt-pt.mk b/dictionaries/Dictionary_pt-pt.mk
deleted file mode 100644
index 12c68fe..000
--- a/dictionaries/Dictionary_pt-pt.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Dictionary_Dictionary,dict-pt-pt,dictionaries/pt_PT))
-
-$(eval $(call gb_Dictionary_add_root_files,dict-pt-pt,\
-   dictionaries/pt_PT/hyph_pt_PT.dic \
-   dictionaries/pt_PT/LICENSES.txt \
-   dictionaries/pt_PT/pt_PT.aff \
-   dictionaries/pt_PT/pt_PT.dic \
-   dictionaries/pt_PT/README_hyph_pt_PT.txt \
-   dictionaries/pt_PT/README_pt_PT.txt \
-   dictionaries/pt_PT/README_th_pt_PT_v2.txt \
-))
-
-$(eval $(call gb_Dictionary_add_thesauri,dict-pt-pt,\
-   dictionaries/pt_PT/th_pt_PT_v2.dat \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/dictionaries/Dictionary_pt.mk b/dictionaries/Dictionary_pt.mk
deleted file mode 100644
index 9e0d45f..000
--- a/dictionaries/Dictionary_pt.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This fil

[Libreoffice-commits] .: boost/boost.6397.warnings.patch

[Libreoffice Gerrit user]

 boost/boost.6397.warnings.patch |   15 +++
 1 file changed, 15 insertions(+)

New commits:
commit eecaca80bdcf9060a5dd06a835a2c1752b4fec01
Author: Caolán McNamara 
Date:   Fri Sep 28 13:11:19 2012 +0100

WaE: some warnings on RHEL-6 gcc

Change-Id: I7d852595fbe0395bc29aba86b2e110ffb5c28823

diff --git a/boost/boost.6397.warnings.patch b/boost/boost.6397.warnings.patch
index 82e3b5e..9c4c1ec 100644
--- a/boost/boost.6397.warnings.patch
+++ b/boost/boost.6397.warnings.patch
@@ -255,3 +255,18 @@
  
  };
  
+--- misc/boost_1_44_0/boost/multi_array.hpp2012-09-28 13:06:44.796521371 
+0100
 misc/build/boost_1_44_0/boost/multi_array.hpp  2012-09-28 
13:07:25.119002500 +0100
+@@ -423,9 +423,9 @@
+ // Build index_gen objects to create views with the same shape
+ 
+ // these need to be separate to handle non-zero index bases
+-typedef detail::multi_array::index_gen index_gen;
+-index_gen old_idxes;
+-index_gen new_idxes;
++typedef detail::multi_array::index_gen lcl_index_gen;
++lcl_index_gen old_idxes;
++lcl_index_gen new_idxes;
+ 
+ std::transform(new_array.index_base_list_.begin(),
+new_array.index_base_list_.end(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/killsdf' - 6 commits - translations/CustomTarget_translate.mk translations/prj

[Libreoffice Gerrit user]

 translations/CustomTarget_translate.mk |   27 +--
 translations/prj/makefile.mk   |1 -
 2 files changed, 17 insertions(+), 11 deletions(-)

New commits:
commit 21da6a93b77e804b454792820c69c65f9e52c2a7
Author: Caolán McNamara 
Date:   Thu Sep 27 09:05:06 2012 +0100

add depend on uiex

diff --git a/translations/CustomTarget_translate.mk 
b/translations/CustomTarget_translate.mk
index 0bd41ef..7249e39 100644
--- a/translations/CustomTarget_translate.mk
+++ b/translations/CustomTarget_translate.mk
@@ -85,7 +85,7 @@ $(translations_DIR)/sdf-l10n/qtz.sdf : \
$(if $(findstring s,$(MAKEFLAGS)),> /dev/null))
 
 $(translations_DIR)/sdf-template/en-US.sdf : $(OUTDIR_FOR_BUILD)/bin/propex \
-   $(foreach exec,cfgex helpex localize transex3 ulfex xrmex, \
+   $(foreach exec,cfgex helpex localize transex3 uiex ulfex xrmex, 
\
$(call gb_Executable_get_target_for_build,$(exec)))
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),LOC,1)
$(call gb_Helper_abbreviate_dirs, \
commit 0ecde13e1c9342071aab1973cd888f451ab783cb
Author: David Tardon 
Date:   Tue Sep 25 20:07:37 2012 +0200

use absolute paths

diff --git a/translations/CustomTarget_translate.mk 
b/translations/CustomTarget_translate.mk
index 2827355..0bd41ef 100644
--- a/translations/CustomTarget_translate.mk
+++ b/translations/CustomTarget_translate.mk
@@ -58,6 +58,7 @@ $(translations_DIR)/merge.done : \

$(WORKDIR)/CustomTarget/translations/localization_present.mk && \
touch $@)
 
+# TODO: remove the realpaths when we have git submodules
 $(translations_DIR)/sdf-l10n/%.sdf : \
$(translations_DIR)/sdf-template/en-US.sdf \
$(OUTDIR_FOR_BUILD)/bin/po2lo \
@@ -65,11 +66,11 @@ $(translations_DIR)/sdf-l10n/%.sdf : \
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SDF,1)
$(call gb_Helper_abbreviate_dirs, \
$(gb_PYTHON) $(OUTDIR_FOR_BUILD)/bin/po2lo --skipsource -i \
-   source/$* -t $< -o $@ -l $*)
+   $(realpath $(SRCDIR)/translations/source/$*) -t $< -o 
$@ -l $*)
 
 define translations_make_po_deps
 $(translations_DIR)/sdf-l10n/$(1).sdf : \
-   $$(shell find $(SRCDIR)/translations/source/$(1) -name "*\.po")
+   $$(shell find $(realpath $(SRCDIR)/translations/source/$(1)) 
-name "*\.po")
 
 endef
 
commit c8fa8471c2032f6790c48885c51c0ab3daab6380
Author: David Tardon 
Date:   Tue Sep 25 18:56:22 2012 +0200

only process sdf files

diff --git a/translations/CustomTarget_translate.mk 
b/translations/CustomTarget_translate.mk
index d5bb6a4..2827355 100644
--- a/translations/CustomTarget_translate.mk
+++ b/translations/CustomTarget_translate.mk
@@ -49,7 +49,7 @@ $(translations_DIR)/merge.done : \
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MRG,2)
$(call gb_Helper_abbreviate_dirs, \
rm -rf $(translations_DIR)/sdf && mkdir $(translations_DIR)/sdf 
&& \
-   RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,$^) && \
+   RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,$(filter 
%.sdf,$^)) && \
perl $(OUTDIR_FOR_BUILD)/bin/fast_merge.pl -sdf_files 
$${RESPONSEFILE} \
-merge_dir $(translations_DIR)/sdf \
$(if $(findstring s,$(MAKEFLAGS)),> /dev/null) && \
commit 84442ae80f2169c541c7969bb27aedf3a57ece9d
Author: David Tardon 
Date:   Sun Sep 23 15:00:44 2012 +0200

make deps on sdf files work

diff --git a/translations/CustomTarget_translate.mk 
b/translations/CustomTarget_translate.mk
index d84f7f6..d5bb6a4 100644
--- a/translations/CustomTarget_translate.mk
+++ b/translations/CustomTarget_translate.mk
@@ -38,6 +38,9 @@ else
 translations_LANGS := $(filter-out en-US,$(WITH_LANG))
 endif
 
+$(translations_DIR)/sdf/%.sdf : $(translations_DIR)/merge.done
+   touch $@
+
 #TODO: remove localization_present.mk when translations are in tail_build
 $(translations_DIR)/merge.done : \
$(foreach 
lang,$(translations_LANGS),$(translations_DIR)/sdf-l10n/$(lang).sdf) \
commit 59266299e1c17d50fdf30f38c104811d4c6dc60e
Author: David Tardon 
Date:   Sun Sep 23 14:47:02 2012 +0200

use pattern rule

diff --git a/translations/CustomTarget_translate.mk 
b/translations/CustomTarget_translate.mk
index 07fdf2d..d84f7f6 100644
--- a/translations/CustomTarget_translate.mk
+++ b/translations/CustomTarget_translate.mk
@@ -55,20 +55,22 @@ $(translations_DIR)/merge.done : \

$(WORKDIR)/CustomTarget/translations/localization_present.mk && \
touch $@)
 
-define translations_RULE
-$(translations_DIR)/sdf-l10n/$(1).sdf : \
+$(translations_DIR)/sdf-l10n/%.sdf : \
$(translations_DIR)/sdf-template/en-US.sdf \
$(OUTDIR_FOR_BUILD)/bin/po2lo \
-   $

Re: OUString is mutable?

[Michael Stahl]

On 28/09/12 13:46, Noel Grandin wrote:
> Hi
> 
> I don't really understand the point of not being able to mutate OUString 
> in-place, but being able to overwrite it via the assignment operator?
> 
> It seems to me it should be one or the other.
> Either OUString is immutable, and it cannot be assigned to, except via a 
> constructor, or it is mutable, and we can pretty much throw away 
> OUStringBuffer.

[accidentally sent this first to Noel only instead of the list]

the point you are missing is that OUString is a sort of "smart pointer"
to an immutable buffer.  it works similarly to "String" in Java, e.g. in
Java "String s = "foo"; s = "bar"" is legal but you cannot modify the
content of whatever value is assigned to "s".

that's why OUString has an operator= that makes it point at a different
buffer but offers no way to write into the buffer (at least i hope it
doesn't...).



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

Re: OUString is mutable?

[Noel Grandin]

On 2012-09-28 14:03, Caolán McNamara wrote:

Hi

I don't really understand the point of not being able to mutate OUString
in-place, but being able to overwrite it via the assignment operator?

It seems to me it should be one or the other.
Either OUString is immutable, and it cannot be assigned to, except via a
constructor, or it is mutable, and we can pretty much throw away
OUStringBuffer.
Consider OUString as a smart const pointer to an immutable rtl_uString.

i.e.
const char *pFoo;
pFoo = "hello";
pFoo = "world"; //ok
pFoo[0] = 'A'; //won't compile
const_cast(pFoo)[0] = 'A'; //compiles but evil





Thanks. Weird, but makes sense.

Just looks very strange when we're passing an OUString as a parameter to 
a function in order that the function can write to it.



Disclaimer: http://www.peralex.com/disclaimer.html


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

Re: OUString is mutable?

[Caolán McNamara]

On Fri, 2012-09-28 at 13:46 +0200, Noel Grandin wrote:
> Hi
> 
> I don't really understand the point of not being able to mutate OUString 
> in-place, but being able to overwrite it via the assignment operator?
> 
> It seems to me it should be one or the other.
> Either OUString is immutable, and it cannot be assigned to, except via a 
> constructor, or it is mutable, and we can pretty much throw away 
> OUStringBuffer.

Consider OUString as a smart const pointer to an immutable rtl_uString.

i.e.
const char *pFoo;
pFoo = "hello";
pFoo = "world"; //ok
pFoo[0] = 'A'; //won't compile
const_cast(pFoo)[0] = 'A'; //compiles but evil

C.

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

[Libreoffice-commits] .: l10ntools/Executable_gsicheck.mk l10ntools/inc l10ntools/source l10ntools/StaticLibrary_transex.mk

[Libreoffice Gerrit user]

 l10ntools/Executable_gsicheck.mk   |6 
 l10ntools/StaticLibrary_transex.mk |2 
 l10ntools/inc/export.hxx   |   23 -
 l10ntools/inc/gsicheck.hxx |   34 --
 l10ntools/source/gsicheck.cxx  |  454 +++-
 l10ntools/source/gsimain.cxx   |  456 -
 l10ntools/source/helpmerge.cxx |   10 
 l10ntools/source/merge.cxx |9 
 8 files changed, 443 insertions(+), 551 deletions(-)

New commits:
commit 8b97644bab0e9106b798a5b8969aa796e558ef3f
Author: Andras Timar 
Date:   Fri Sep 28 13:57:36 2012 +0200

Revert "fdo#52246 let helpex use gsicheck's tag checker"

This reverts commit e3b927787f3643f9e584cc80c974d5f907a94858.
There will be a better solution in feature/killsdf soon.

Conflicts:

l10ntools/inc/gsicheck.hxx
l10ntools/source/gsicheck.cxx
l10ntools/source/gsimain.cxx

Change-Id: I5d12f4ee069d7024345d78c45fb1587cb006c922

diff --git a/l10ntools/Executable_gsicheck.mk b/l10ntools/Executable_gsicheck.mk
index fceb61a..917c00f 100644
--- a/l10ntools/Executable_gsicheck.mk
+++ b/l10ntools/Executable_gsicheck.mk
@@ -34,12 +34,10 @@ $(eval $(call gb_Executable_set_include,gsicheck,\
 $(eval $(call gb_Executable_use_libraries,gsicheck,\
 sal \
 ))
-$(eval $(call gb_Executable_use_static_libraries,gsicheck,\
-transex \
-))
 
 $(eval $(call gb_Executable_add_exception_objects,gsicheck,\
-l10ntools/source/gsimain \
+l10ntools/source/gsicheck \
+l10ntools/source/tagtest \
 ))
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/l10ntools/StaticLibrary_transex.mk 
b/l10ntools/StaticLibrary_transex.mk
index f9dd165..e8c84b7 100644
--- a/l10ntools/StaticLibrary_transex.mk
+++ b/l10ntools/StaticLibrary_transex.mk
@@ -37,8 +37,6 @@ $(eval $(call gb_StaticLibrary_add_exception_objects,transex,\
 l10ntools/source/merge \
 l10ntools/source/file \
 l10ntools/source/directory \
-l10ntools/source/tagtest \
-l10ntools/source/gsicheck \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index d11d06f..be24360 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -71,9 +71,6 @@ typedef boost::unordered_map
 typedef boost::unordered_map
 MergeDataHashMap;
 
-typedef boost::unordered_map
-LineNumberHashMap;
-
 #define SOURCE_LANGUAGE rtl::OString(RTL_CONSTASCII_STRINGPARAM("en-US"))
 #define X_COMMENT rtl::OString(RTL_CONSTASCII_STRINGPARAM("x-comment"))
 #define LIST_REFID  "LIST_REFID"
@@ -377,36 +374,23 @@ private:
 OStringBoolHashMap bQuickHelpTextFirst;
 OStringHashMap sTitle;
 OStringBoolHashMap bTitleFirst;
-OStringHashMap sSDFLine;
-LineNumberHashMap nLine;
 
 public:
 PFormEntrys( const rtl::OString &rPForm ) : data_( rPForm ) {};
 void InsertEntry(const rtl::OString &rId, const rtl::OString &rText,
-const rtl::OString &rQuickHelpText, const rtl::OString &rTitle,
-const rtl::OString &rSDFLine, const std::size_t nLineIn)
+const rtl::OString &rQuickHelpText, const rtl::OString &rTitle)
 {
+
 sText[ rId ] = rText;
 bTextFirst[ rId ] = true;
 sQuickHelpText[ rId ] = rQuickHelpText;
 bQuickHelpTextFirst[ rId ] = true;
 sTitle[ rId ] = rTitle;
 bTitleFirst[ rId ] = true;
-sSDFLine[ rId ] = rSDFLine;
-nLine[ rId ] = nLineIn;
 }
 sal_Bool GetText( rtl::OString &rReturn, sal_uInt16 nTyp, const 
rtl::OString &nLangIndex, sal_Bool bDel = sal_False );
 sal_Bool GetTransex3Text( rtl::OString &rReturn, sal_uInt16 nTyp, const 
rtl::OString &nLangIndex, sal_Bool bDel = sal_False );
 
-rtl::OString & GetSDF(const rtl::OString &nLangIndex)
-{
-return sSDFLine[nLangIndex];
-}
-
-std::size_t GetNLine(const rtl::OString &nLangIndex)
-{
-return nLine[nLangIndex];
-}
 };
 
 //
@@ -459,8 +443,7 @@ class MergeDataFile
 const rtl::OString &rLID, const rtl::OString &rPFO,
 const rtl::OString &nLang, const rtl::OString &rTEXT,
 const rtl::OString &rQHTEXT, const rtl::OString &rTITLE,
-const rtl::OString &sFilename, bool bCaseSensitive,
-const rtl::OString &rSDF, std::size_t nLine);
+const rtl::OString &sFilename, bool bCaseSensitive);
 public:
 explicit MergeDataFile(const rtl::OString &rFileName,
 const rtl::OString& rFile, bool bCaseSensitive);
diff --git a/l10ntools/inc/gsicheck.hxx b/l10ntools/inc/gsicheck.hxx
index a33796c..467925e 100644
--- a/l10ntools/inc/gsicheck.hxx
+++ b/l10ntools/inc/gsicheck.hxx
@@ -33,7 +33,6 @@
 
 #include 
 #include 
-#include 
 
 #include "tagtest.hxx"
 
@@ -132,39 +131,6 @@ public:
 void WriteFixed( LazyStream &aFixOut );
 };
 
-sal_Bool check(rtl::OString s,std::size_t nLine);
-
-void PrintMessage( rtl::OString const & aType, rtl::OString const & aMsg, 
rtl::OString 

[Libreoffice-commits] .: svtools/source

[Libreoffice Gerrit user]

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

New commits:
commit e05ba1446b1d65f0cb84130b060241065da8
Author: Caolán McNamara 
Date:   Fri Sep 28 12:49:36 2012 +0100

Related: fdo#39626 bootstrap.ini is windows-only, use generic mechanism

Change-Id: If3cb8451b8af874b82512f1b731654d918d0a196

diff --git a/svtools/source/control/ctrlbox.cxx 
b/svtools/source/control/ctrlbox.cxx
index 1ee9589..9b82dd9 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -1143,7 +1143,7 @@ void FontNameBox::LoadMRUEntries( const String& 
aFontMRUEntriesFile, xub_Unicode
 
 void FontNameBox::InitFontMRUEntriesFile()
 {
-rtl::OUString 
sUserConfigDir(RTL_CONSTASCII_USTRINGPARAM("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}"));
+rtl::OUString sUserConfigDir("${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( 
"bootstrap") "::UserInstallation}");
 rtl::Bootstrap::expandMacros(sUserConfigDir);
 
 maFontMRUEntriesFile = sUserConfigDir;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] docx import: set table above/bottom spacing to 0

[Pierre-Eric Pelloux-Prayer (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/713

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/13/713/1

docx import: set table above/bottom spacing to 0

Change-Id: I3e0397dd3d5d14f1e584ac7bc3d22d4638393b06
---
A sw/qa/extras/ooxmlimport/data/n779941.docx
M sw/qa/extras/ooxmlimport/ooxmlimport.cxx
M writerfilter/source/dmapper/DomainMapperTableHandler.cxx
3 files changed, 30 insertions(+), 0 deletions(-)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e0397dd3d5d14f1e584ac7bc3d22d4638393b06
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Pierre-Eric Pelloux-Prayer 

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

[PATCH] docx export: always write tblInd attribute (even when equal ...

[Pierre-Eric Pelloux-Prayer (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/718

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/18/718/1

docx export: always write tblInd attribute (even when equal to 0)

Otherwise when opening the docx in Office table may get misplaced.

Change-Id: Ic1df8d941c72a224d2db189ededfc5e134e5683a
---
M sw/source/filter/ww8/docxattributeoutput.cxx
1 file changed, 5 insertions(+), 6 deletions(-)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic1df8d941c72a224d2db189ededfc5e134e5683a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Pierre-Eric Pelloux-Prayer 

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

docx export: export default table cell margins and borders

[Pierre-Eric Pelloux-Prayer (via Code Review)]

Pierre-Eric Pelloux-Prayer has abandoned this change.

Change subject: docx export: export default table cell margins and borders
..


Patch Set 2: Abandoned

Replaced by new patchset #713 -> #718

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: I49ec61ea92536f51df01aa1bfd6121e51b029441
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Pierre-Eric Pelloux-Prayer 
Gerrit-Reviewer: Noel Power 

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

[PATCH] docx export: export default table cell margins, based on 1st...

[Pierre-Eric Pelloux-Prayer (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/716

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/16/716/1

docx export: export default table cell margins, based on 1st cell

Change-Id: I1a697c2a60c7979774242fb6c9b0f66baa3bb72e
---
M sw/source/filter/ww8/docxattributeoutput.cxx
M sw/source/filter/ww8/docxattributeoutput.hxx
2 files changed, 115 insertions(+), 34 deletions(-)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1a697c2a60c7979774242fb6c9b0f66baa3bb72e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Pierre-Eric Pelloux-Prayer 

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

[PATCH] docx import: properly import table position

[Pierre-Eric Pelloux-Prayer (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/714

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/14/714/1

docx import: properly import table position

This a follow up of commit 53b7f7df0617bcbd7bbef9a34ef53e5097eb16dc

Change-Id: Ia0f79ca24418636af14162e9f339237d847dc221
---
M writerfilter/source/dmapper/DomainMapperTableHandler.cxx
1 file changed, 11 insertions(+), 16 deletions(-)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia0f79ca24418636af14162e9f339237d847dc221
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Pierre-Eric Pelloux-Prayer 

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

[PATCH] docx import: add table position unit test

[Pierre-Eric Pelloux-Prayer (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/715

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/15/715/1

docx import: add table position unit test

Change-Id: I21aa721e20be4b7f9984bf6910a94a7b7bf09c7a
---
A sw/qa/extras/ooxmlimport/data/n779957.docx
M sw/qa/extras/ooxmlimport/ooxmlimport.cxx
2 files changed, 46 insertions(+), 0 deletions(-)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I21aa721e20be4b7f9984bf6910a94a7b7bf09c7a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Pierre-Eric Pelloux-Prayer 

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

[PATCH] docx export: add unit test for 7a2be96

[Pierre-Eric Pelloux-Prayer (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/717

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/17/717/1

docx export: add unit test for 7a2be96

Change-Id: I25aa07d3e1811fdf4ab0124e14794e70d7de82ec
---
M sw/qa/extras/ooxmlexport/ooxmlexport.cxx
1 file changed, 49 insertions(+), 0 deletions(-)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I25aa07d3e1811fdf4ab0124e14794e70d7de82ec
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Pierre-Eric Pelloux-Prayer 

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

OUString is mutable?

[Noel Grandin]

Hi

I don't really understand the point of not being able to mutate OUString 
in-place, but being able to overwrite it via the assignment operator?


It seems to me it should be one or the other.
Either OUString is immutable, and it cannot be assigned to, except via a 
constructor, or it is mutable, and we can pretty much throw away 
OUStringBuffer.


Regards, Noel Grandin

Disclaimer: http://www.peralex.com/disclaimer.html


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

Re: need help with unit test and process service factory

[Stephan Bergmann]

On 09/28/2012 01:03 AM, Matúš Kukan wrote:

I've tried --enable-telepathy again and found out that the unit test
does not work now.
After 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=4917f0ceb2a7b1bb3ba878373f71f38d156278af
I am getting:
- Exception while getting config.ini url: null process service factory
It's from tubes/qa/test_manager.cxx :
utl::LocalFileHelper::ConvertPhysicalNameToURL


That ConvertPhysicalNameToURL apparently internally calls 
comphelper::getProcessServiceFactory to obtain the process service 
factory; what recently changed with 
 
"Make getProcessComponentContext/ServiceFactory throw instead of 
returning null" is that it throws now when the factory is unset (which 
it should never be).


The way CppUnit tests should get the factory set is via the 
unobootstrapprotector that is enabled with gb_CppunitTest_use_ure (cf. 
solenv/gbuild/CppunitTest.mk).  What is unclear to me is whether that 
also requires that your test fixture is derived from 
test::BootstrapFixtureBase (unotest/bootstrapfixturebase.hxx) or whether 
CppUnit::TestFixture suffices.


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

[Libreoffice-commits] .: 4 commits - scp2/source solenv/bin

[Libreoffice Gerrit user]

 scp2/source/ooo/file_ooo.scp|   12 -
 solenv/bin/modules/installer/windows/msp.pm |  264 ++--
 2 files changed, 25 insertions(+), 251 deletions(-)

New commits:
commit 52e61794edd630261b34cd5a20220231877c
Author: Tor Lillqvist 
Date:   Thu Jul 19 10:55:35 2012 +0200

set MSP name

Change-Id: Ib1120ea82a8e3e9d15d524ff413a1342dec3dad0

diff --git a/solenv/bin/modules/installer/windows/msp.pm 
b/solenv/bin/modules/installer/windows/msp.pm
index a5e9ad2..e144c45 100644
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ b/solenv/bin/modules/installer/windows/msp.pm
@@ -311,41 +311,7 @@ sub set_mspfilename
 {
 my ($allvariables, $mspdir, $languagesarrayref) = @_;
 
-my $databasename = $allvariables->{'PRODUCTNAME'};
-$databasename = lc($databasename);
-$databasename =~ s/\.//g;
-$databasename =~ s/\-//g;
-$databasename =~ s/\s//g;
-
-if ( $allvariables->{'MSPPRODUCTVERSION'} ) { $databasename = 
$databasename . $allvariables->{'MSPPRODUCTVERSION'}; }
-
-# possibility to overwrite the name with variable DATABASENAME
-# if ( $allvariables->{'DATABASENAME'} ) { $databasename = 
$allvariables->{'DATABASENAME'}; }
-
-# Adding patch info to database name
-# if ( $installer::globals::buildid ) { $databasename = $databasename . 
"_" . $installer::globals::buildid; }
-
-# if ( $allvariables->{'VENDORPATCHVERSION'} ) { $databasename = 
$databasename . "_" . $allvariables->{'VENDORPATCHVERSION'}; }
-
-
-if (( $allvariables->{'SERVICEPACK'} ) && ( $allvariables->{'SERVICEPACK'} 
== 1 ))
-{
-my $windowspatchlevel = 0;
-if ( $allvariables->{'MSPPATCHLEVEL'} ) { $windowspatchlevel = 
$allvariables->{'MSPPATCHLEVEL'}; }
-$databasename = $databasename . "_servicepack_" . $windowspatchlevel;
-my $languagestring = create_langstring($languagesarrayref);
-$databasename = $databasename . $languagestring;
-}
-else
-{
-my $hotfixaddon = "hotfix_";
-$hotfixaddon = $hotfixaddon . $installer::globals::buildid;
-my $cwsname = "";
-if ( $allvariables->{'OVERWRITE_CWSNAME'} ) { $hotfixaddon = 
$allvariables->{'OVERWRITE_CWSNAME'}; }
-$databasename = $databasename . "_" . $hotfixaddon;
-}
-
-$databasename = $databasename . ".msp";
+my $databasename = $allvariables->{'PRODUCTNAME'} . "-PTF-" . 
$allvariables->{'PRODUCTVERSION'} . "-" . $allvariables->{'WINDOWSPATCHLEVEL'} 
. ".msp";
 
 my $fullmspname = $mspdir . $installer::globals::separator . $databasename;
 
commit 997bfce2df6648160ccec41e0a4e440d8711b429
Author: Andras Timar 
Date:   Fri Jul 20 22:55:26 2012 +0200

work around unexpected behaviour of msidb.exe from SDK 7.1

Change-Id: I48cfa19c40140dc81b105e27051f99e8f1a0c8ae

diff --git a/solenv/bin/modules/installer/windows/msp.pm 
b/solenv/bin/modules/installer/windows/msp.pm
index 7816cec..a5e9ad2 100644
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ b/solenv/bin/modules/installer/windows/msp.pm
@@ -175,23 +175,27 @@ sub include_tables_into_pcpfile
 $localworkdir =~ s/\///g;
 }
 
-$systemcall = $msidb . " -d " . $localfullpcpfilepath . " -f " . 
$localworkdir . " -i " . $tables;
-
-$returnvalue = system($systemcall);
+my @tables = split(' ', $tables); # I found that msidb from Windows SDK 
7.1 did not accept more than one table.
+foreach my $table (@tables)
+{
+$systemcall = $msidb . " -d " . $localfullpcpfilepath . " -f " . 
$localworkdir . " -i " . $table;
 
-$infoline = "Systemcall: $systemcall\n";
-push( @installer::globals::logfileinfo, $infoline);
+$returnvalue = system($systemcall);
 
-if ($returnvalue)
-{
-$infoline = "ERROR: Could not execute $systemcall !\n";
-push( @installer::globals::logfileinfo, $infoline);
-installer::exiter::exit_program("ERROR: Could not include tables into 
pcp file: $fullpcpfilepath !", "include_tables_into_pcpfile");
-}
-else
-{
-$infoline = "Success: Executed $systemcall successfully!\n";
+$infoline = "Systemcall: $systemcall\n";
 push( @installer::globals::logfileinfo, $infoline);
+
+if ($returnvalue)
+{
+$infoline = "ERROR: Could not execute $systemcall !\n";
+push( @installer::globals::logfileinfo, $infoline);
+installer::exiter::exit_program("ERROR: Could not include tables 
into pcp file: $fullpcpfilepath !", "include_tables_into_pcpfile");
+}
+else
+{
+$infoline = "Success: Executed $systemcall successfully!\n";
+push( @installer::globals::logfileinfo, $infoline);
+}
 }
 }
 
commit 609583db3f83343e3e42e6c94fd4cf218f11327c
Author: Andras Timar 
Date:   Sun Jul 22 09:11:14 2012 +0200

revert fc1e9f253dd07362065f2be9691be89fb9b3f84f

I don't know, if it made sense, but it definitely broke MSP
patch creati

[Bug 54157] LibreOffice 3.7 most annoying bugs

[bugzilla-daemon]

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

Bug 54157 depends on bug 54744, which changed state.

Bug 54744 Summary: Hybrid PDF export are corrupted
https://bugs.freedesktop.org/show_bug.cgi?id=54744

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

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

Re: [PUSHED] fdo#42135 - Appending a Library functionality in Macro Programming missing or misdocumented

[Andras Timar]

2012/9/28 Niklas Johansson :
> The button referred to in the bug has changed name from Append to Import.
> This updates the help files to reflect the change.
>
Pushed to master.

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

[Libreoffice-commits] .: helpcontent2/source

[Libreoffice Gerrit user]

 helpcontent2/source/text/sbasic/shared/01030400.xhp |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 752c24a0d69670fc9577fa4ae4cfac0d3ae00269
Author: Niklas Johansson 
Date:   Fri Sep 28 11:59:39 2012 +0200

fdo#42135 Button changed name, update help file to reflect change

In the Macro Organizer the button Append changed name to Import, this 
updates the help file

diff --git a/helpcontent2/source/text/sbasic/shared/01030400.xhp 
b/helpcontent2/source/text/sbasic/shared/01030400.xhp
index bb55891..21d282e 100644
--- a/helpcontent2/source/text/sbasic/shared/01030400.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01030400.xhp
@@ -69,7 +69,7 @@
 Click New and insert a name to create a new 
library.
 
 
-Appending a Library
+Import a Library
 
 
 Choose Tools - Macros - Organize Macros - %PRODUCTNAME 
Basic and click Organizer or click the Select 
Module icon in the Basic IDE to open the Macro Organizer 
dialog.
@@ -78,13 +78,13 @@
 Click the Libraries tab.
 
 
-Select to where you want to append the library in the 
Location list. If you select %PRODUCTNAME Macros & Dialogs, 
the library will belong to the $[officename] application and will be available 
for all documents. If you select a document the library will be appended to 
this document and only available from there.
+Select to where you want to import the library in the 
Location list. If you select %PRODUCTNAME Macros & Dialogs, 
the library will belong to the $[officename] application and will be available 
for all documents. If you select a document the library will be imported to 
this document and only available from there.
 
 
-Click Append and select an external library to 
append.
+Click Import... and select an external library to 
import.
 
 
-Select all libraries to be appended in the Append 
Libraries dialog. The dialog displays all libraries that are contained 
in the selected file.
+Select all libraries to be imported in the Import 
Libraries dialog. The dialog displays all libraries that are contained 
in the selected file.
 
 
 If you want to insert the library as a reference only check the 
Insert as reference (read-only) box. Read-only libraries are fully 
functional but cannot be modified in the Basic IDE.
@@ -93,7 +93,7 @@
 Check the Replace existing libraries box if you want 
existing libraries of the same name to be overwritten.
 
 
-Click OK to append the library.
+Click OK to import the library.
 
 
 Deleting a Library
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sfx2/source

[Libreoffice Gerrit user]

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

New commits:
commit 469780c715f2a5dee6c58347941aefe6f3de079f
Author: Stephan Bergmann 
Date:   Fri Sep 28 12:47:13 2012 +0200

fdo#54744: Fix broken logic of string comparison

d1cc007108442056f50d3a6d1212b2b4cfdc4c14 "sal_Bool to bool, String to 
OUString,
in SfxMedium." changed

  !aLogicName.CompareToAscii( "private:stream", 14 ) == COMPARE_EQUAL 
// (a)

where that suspicious ! made it effectively behave as

  aLogicName.CompareToAscii( "private:stream", 14 ) != COMPARE_EQUAL  
// (b)

to

  (aLogicName.compareToAscii("private:stream", 14) == 0)  
// (c)

where (c) corresponds to (a), but the intended behavior was apparently (b):
Exporting to hybrid PDF now causes the embedded ODF stream (which is saved 
to a
private:stream URL) to be empty, as (c) is erroneously satisfied now, 
causing
the following lines to erroneously clear SID_OUTPUTSTREAM.

Change-Id: Ia2c1a69db7b4da07bfe01f52c3f6759301358a84

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 06253f3..db5887e 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -2464,7 +2464,7 @@ void SfxMedium::Init_Impl()
 SFX_ITEMSET_ARG( pImp->m_pSet, pOutStreamItem, SfxUnoAnyItem, 
SID_OUTPUTSTREAM, false);
 if( pOutStreamItem
  && ( !( pOutStreamItem->GetValue() >>= rOutStream )
-  || (pImp->m_aLogicName.compareToAscii("private:stream", 14) == 0)) )
+  || (pImp->m_aLogicName.compareToAscii("private:stream", 14) != 0)) )
 {
 pImp->m_pSet->ClearItem( SID_OUTPUTSTREAM );
 OSL_FAIL( "Unexpected Output stream parameter!\n" );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] ::rtl::OUString to OUString in basctl

[Olivier Hallot (via Code Review)]

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/711

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7be699102eab9cbf7184a5777a4b161db885adec
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ricardo Montania 
Gerrit-Reviewer: Olivier Hallot 

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

[Libreoffice-commits] .: basctl/source

[Libreoffice Gerrit user]

 basctl/source/basicide/unomodel.cxx|8 
 basctl/source/basicide/unomodel.hxx|   10 +-
 basctl/source/inc/accessibledialogcontrolshape.hxx |   16 
 basctl/source/inc/baside3.hxx  |8 
 basctl/source/inc/dlgedobj.hxx |8 
 basctl/source/inc/iderid.hxx   |2 +-
 6 files changed, 26 insertions(+), 26 deletions(-)

New commits:
commit 6cb080ff913fce2d0477566420157733de997f52
Author: Ricardo Montania 
Date:   Thu Sep 27 13:22:42 2012 -0300

::rtl::OUString to OUString in basctl

Change-Id: I7be699102eab9cbf7184a5777a4b161db885adec
Reviewed-on: https://gerrit.libreoffice.org/711
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/basctl/source/basicide/unomodel.cxx 
b/basctl/source/basicide/unomodel.cxx
index ef95956..6825aa2 100644
--- a/basctl/source/basicide/unomodel.cxx
+++ b/basctl/source/basicide/unomodel.cxx
@@ -87,14 +87,14 @@ OUString SIDEModel::getImplementationName(void) throw( 
uno::RuntimeException )
 return getImplementationName_Static();
 }
 
-::rtl::OUString SIDEModel::getImplementationName_Static()
+OUString SIDEModel::getImplementationName_Static()
 {
-return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
"com.sun.star.comp.basic.BasicIDE" ));
+return OUString( "com.sun.star.comp.basic.BasicIDE" );
 }
 
 sal_Bool SIDEModel::supportsService(const OUString& rServiceName) throw( 
uno::RuntimeException )
 {
-return rServiceName == ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
"com.sun.star.script.BasicIDE" ));
+return rServiceName == OUString( "com.sun.star.script.BasicIDE" );
 }
 uno::Sequence< OUString > SIDEModel::getSupportedServiceNames(void) throw( 
uno::RuntimeException )
 {
@@ -105,7 +105,7 @@ uno::Sequence< OUString > 
SIDEModel::getSupportedServiceNames_Static(void)
 {
 uno::Sequence< OUString > aRet(1);
 OUString* pArray = aRet.getArray();
-pArray[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
"com.sun.star.script.BasicIDE" ));
+pArray[0] = "com.sun.star.script.BasicIDE" ;
 return aRet;
 }
 
diff --git a/basctl/source/basicide/unomodel.hxx 
b/basctl/source/basicide/unomodel.hxx
index 41ce8fe..87b230a 100644
--- a/basctl/source/basicide/unomodel.hxx
+++ b/basctl/source/basicide/unomodel.hxx
@@ -43,15 +43,15 @@ public:
 virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > 
SAL_CALL getTypes(  ) throw(::com::sun::star::uno::RuntimeException);
 
 //XServiceInfo
-virtual rtl::OUString SAL_CALL getImplementationName(void)
+virtual OUString SAL_CALL getImplementationName(void)
 throw( ::com::sun::star::uno::RuntimeException );
-virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName)
+virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
 throw( ::com::sun::star::uno::RuntimeException );
-virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL 
getSupportedServiceNames(void)
+virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL 
getSupportedServiceNames(void)
 throw( ::com::sun::star::uno::RuntimeException );
 
-static ::com::sun::star::uno::Sequence< rtl::OUString > 
getSupportedServiceNames_Static();
-static ::rtl::OUString getImplementationName_Static();
+static ::com::sun::star::uno::Sequence< OUString > 
getSupportedServiceNames_Static();
+static OUString getImplementationName_Static();
 };
 
 com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL 
SIDEModel_createInstance(
diff --git a/basctl/source/inc/accessibledialogcontrolshape.hxx 
b/basctl/source/inc/accessibledialogcontrolshape.hxx
index 6068318..46761c1 100644
--- a/basctl/source/inc/accessibledialogcontrolshape.hxx
+++ b/basctl/source/inc/accessibledialogcontrolshape.hxx
@@ -76,7 +76,7 @@ protected:
 
 Window* GetWindow() const;
 
-::rtl::OUString GetModelStringProperty( const sal_Char* 
pPropertyName );
+OUStringGetModelStringProperty( const sal_Char* 
pPropertyName );
 
 virtual voidFillAccessibleStateSet( 
utl::AccessibleStateSetHelper& rStateSet );
 
@@ -103,9 +103,9 @@ public:
 virtual void SAL_CALL propertyChange( const 
::com::sun::star::beans::PropertyChangeEvent& rEvent ) throw 
(::com::sun::star::uno::RuntimeException);
 
 // XServiceInfo
-virtual ::rtl::OUString SAL_CALL getImplementationName() throw 
(::com::sun::star::uno::RuntimeException);
-virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& 
rServiceName ) throw (::com::sun::star::uno::RuntimeException);
-virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL 
getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
+virtual OUString SAL_CALL getImplementationName() throw 
(::com::sun::star::uno::RuntimeException);
+virt

[PATCH] fdo#42135 - Appending a Library functionality in Macro Programming missing or misdocumented

[Niklas Johansson]

The button referred to in the bug has changed name from Append to 
Import. This updates the help files to reflect the change.


--
Regards,
Niklas Johansson

>From 7df5ba3eccd0e04a06163e27a2c8cbbf412c1938 Mon Sep 17 00:00:00 2001
From: Niklas Johansson 
Date: Fri, 28 Sep 2012 11:59:39 +0200
Subject: [PATCH] fdo#42135 Button changed name, update help file to reflect
 change

In the Macro Organizer the button Append changed name to Import, this updates 
the help file
---
 .../source/text/sbasic/shared/01030400.xhp |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/helpcontent2/source/text/sbasic/shared/01030400.xhp 
b/helpcontent2/source/text/sbasic/shared/01030400.xhp
index bb55891..21d282e 100644
--- a/helpcontent2/source/text/sbasic/shared/01030400.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01030400.xhp
@@ -69,7 +69,7 @@
 Click New and insert a name to create a new 
library.
 
 
-Appending a Library
+Import a Library
 
 
 Choose Tools - Macros - Organize Macros - %PRODUCTNAME 
Basic and click Organizer or click the Select 
Module icon in the Basic IDE to open the Macro Organizer 
dialog.
@@ -78,13 +78,13 @@
 Click the Libraries tab.
 
 
-Select to where you want to append the library in the 
Location list. If you select %PRODUCTNAME Macros & Dialogs, 
the library will belong to the $[officename] application and will be available 
for all documents. If you select a document the library will be appended to 
this document and only available from there.
+Select to where you want to import the library in the 
Location list. If you select %PRODUCTNAME Macros & Dialogs, 
the library will belong to the $[officename] application and will be available 
for all documents. If you select a document the library will be imported to 
this document and only available from there.
 
 
-Click Append and select an external library to 
append.
+Click Import... and select an external library to 
import.
 
 
-Select all libraries to be appended in the Append 
Libraries dialog. The dialog displays all libraries that are contained 
in the selected file.
+Select all libraries to be imported in the Import 
Libraries dialog. The dialog displays all libraries that are contained 
in the selected file.
 
 
 If you want to insert the library as a reference only check the 
Insert as reference (read-only) box. Read-only libraries are fully 
functional but cannot be modified in the Basic IDE.
@@ -93,7 +93,7 @@
 Check the Replace existing libraries box if you want 
existing libraries of the same name to be overwritten.
 
 
-Click OK to append the library.
+Click OK to import the library.
 
 
 Deleting a Library
-- 
1.7.9.5

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

[PATCH] fix for fdo#53673 label documents broken since version 3.6.0

[Winfried Donkers]

Attached is a fix for bug 53673.
Possibly the deeper cause of the bug is in Writer document save-functions, 
therefor I do not intend to close the bug after this fax has been pushed.

The fix is a simplification of the code and produces documents with frames that 
represent the labels in a better way. Before this fix, the frames represented a 
label including its left/bottom gap to the next label as a margin. After this 
fix, the frames represent the label itself and the frames are positioned on the 
coorect location (anchored to the page).

(Not yet via gerrit; I must study on ssh keys first...)



Winfried



0001-fdo-52673-fix-for-layout-problems-with-version-3.6-a.patch
Description: 0001-fdo-52673-fix-for-layout-problems-with-version-3.6-a.patch
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: LO 3.6.2 : about Manage dialog from Conditional Formatting

[Bjoern Michaelsen]

Hi Jean-Baptiste,

On Wed, Sep 26, 2012 at 10:29:20AM +0200, Bjoern Michaelsen wrote:
> On Wed, Sep 26, 2012 at 06:35:57AM +0200, Jean-Baptiste Faure wrote:
> > Nobody interested to test and answer?
> 
> I think it is rather that most in QA already have their share of critical bugs
> to care about.

just wanted to follow up on this one as while we discussed the issue at hand
some more in private, my initial email was probably quite a bit harsh when
standing on its own.

Given that, I was happy that you continued to discuss it constructively. Still
please accept my apologies for the inital blunt reply, and I hope the issue
at hand can be worked out satisfactorily in due time.

Best,

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

Re: need help with unit test and process service factory

[Michael Meeks]

On Fri, 2012-09-28 at 01:44 +0200, Matúš Kukan wrote:
> On 28 September 2012 01:03, Matúš Kukan  wrote:
> > Also, it would be really great to have at least one linux tinderbox
> > with --enable-telepathy.
> > Only recent telepathy-glib is needed.
> 
> Ah, that's not true. It should be for building,
> but I forgot that for unit test we need empathy with two jabber
> accounts configured.
> Is that too much for tinderbox ?

In a word - yes :-)

If we can create a unit test that doesn't require any of that, it'd be
great of course. Having said that, I was not a great fan of the way
those unit tests work in the 1st instance with that manual spin the loop
 times type stuff that is hyper fragile - or did we fix that ?

ATB,

Michael.

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

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

Re: [PUSHED-3-6] fix for fdo#55022, crash when opening the test file in ScDBQueryDataIterator

[Michael Meeks]

On Thu, 2012-09-27 at 23:44 +0200, Markus Mohrhard wrote:
> No this one results in a infinite loop because the check nColRow <
> nCellCount in the next if will be always true when it was not before.
> My patch still increments so that the check there is false and we stop
> iterating through the DB range.

Clearly I should wake up more ;-)

OTOH, having APIs that make such off-by-one behaviour easy to write
looks like a problem in itself ;-)

Thanks !

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] .: 2 commits - sw/qa writerfilter/source

[Libreoffice Gerrit user]

 sw/qa/extras/ooxmlimport/data/n782061.docx  |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx|   12 
 writerfilter/source/dmapper/DomainMapper.cxx|   14 +-
 writerfilter/source/dmapper/StyleSheetTable.cxx |4 
 writerfilter/source/dmapper/StyleSheetTable.hxx |3 +++
 5 files changed, 32 insertions(+), 1 deletion(-)

New commits:
commit 7a3a8a254363801bf6893b23d67f86a7461f8f3b
Author: Miklos Vajna 
Date:   Fri Sep 28 09:52:29 2012 +0100

n#782061 testcase

Change-Id: I6aa95063ac8fe825b47decc68b08a35d81e4d59d

diff --git a/sw/qa/extras/ooxmlimport/data/n782061.docx 
b/sw/qa/extras/ooxmlimport/data/n782061.docx
new file mode 100644
index 000..9d8218b
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/n782061.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 1cefa39..a83a398 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -96,6 +96,7 @@ public:
 void testN780853();
 void testN780843();
 void testShadow();
+void testN782061();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -138,6 +139,7 @@ public:
 CPPUNIT_TEST(testN780853);
 CPPUNIT_TEST(testN780843);
 CPPUNIT_TEST(testShadow);
+CPPUNIT_TEST(testN782061);
 #endif
 CPPUNIT_TEST_SUITE_END();
 
@@ -981,6 +983,16 @@ void Test::testShadow()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(273), sal_Int32(aShadow.ShadowWidth));
 }
 
+void Test::testN782061()
+{
+/*
+ * The problem was that the character escapement in the second run was -58.
+ */
+load("n782061.docx");
+
+CPPUNIT_ASSERT_EQUAL(sal_Int32(-9), 
getProperty(getRun(getParagraph(1), 2), "CharEscapement"));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
commit 0c8017a364efb0e8a1cab57b22257e9b319fa0a1
Author: Miklos Vajna 
Date:   Fri Sep 28 09:51:42 2012 +0100

n#782061 DOCX import: w:position should respect w:sz in w:rPrDefault

Subscript relative font size (w:position) is in percents in Writer, but
is in half points in Word. When checking for the default font size to
count the percent value, the mapper should search font size (w:sz) not
only in direct character properties, but also in default character
properties (w:rPrDefault).

Change-Id: I9286d44c6498c765ddfee795d50921ef58b80071

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 52d8c1a..cfd8dad 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2132,7 +2132,9 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, 
PropertyMapPtr rContext, SprmType
 if (xCharStyle.is())
 
xCharStyle->setPropertyValue(rPropNameSupplier.GetName(PROP_CHAR_HEIGHT), aVal);
 }
-m_pImpl->deferCharacterProperty( nSprmId, uno::makeAny( nIntValue 
));
+// Make sure char sizes defined in the stylesheets don't affect 
char props from direct formatting.
+if (!m_pImpl->IsStyleSheetImport())
+m_pImpl->deferCharacterProperty( nSprmId, uno::makeAny( 
nIntValue ));
 }
 break;
 case NS_sprm::LN_CHpsInc:
@@ -3300,12 +3302,22 @@ void DomainMapper::processDeferredCharacterProperties( 
const std::map< sal_Int32
 else
 {
 std::map< sal_Int32, uno::Any >::const_iterator font = 
deferredCharacterProperties.find( NS_sprm::LN_CHps );
+PropertyMapPtr pDefaultCharProps = 
m_pImpl->GetStyleSheetTable()->GetDefaultCharProps();
+PropertyMap::iterator aDefaultFont = 
pDefaultCharProps->find(PropertyDefinition( PROP_CHAR_HEIGHT, false ));
 if( font != deferredCharacterProperties.end())
 {
 double fontSize = 0;
 font->second >>= fontSize;
 nEscapement = nIntValue * 100 / fontSize;
 }
+// TODO if not direct formatting, check the style first, not 
directly the default char props.
+else if (aDefaultFont != pDefaultCharProps->end())
+{
+double fHeight = 0;
+aDefaultFont->second >>= fHeight;
+// fHeight is in points, nIntValue is in half points, 
nEscapement is in percents.
+nEscapement = nIntValue * 100 / fHeight / 2;
+}
 else
 { // TODO: Find out the font size. The 58/-58 values were here 
previous, but I have
   // no idea what they are (they are probably some random 
guess that did fit whatever
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx 
b/writerfilter/source/dmapper/StyleSheetTable.cxx
index be06d59..044b53c 100644
--- a/writerfilter/source/dmapper/StyleSheetTa

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

[Libreoffice Gerrit user]

 l10ntools/Executable_uiex.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2f31023abd7786746ebb59cdc4e73e86af4de8cb
Author: Caolán McNamara 
Date:   Fri Sep 28 09:44:21 2012 +0100

explicitly link to libxslt

Change-Id: I8cfcd82bd6198bcf70d6ec082f82aaac34cc50c2

diff --git a/l10ntools/Executable_uiex.mk b/l10ntools/Executable_uiex.mk
index 847d89a..ca4d726 100644
--- a/l10ntools/Executable_uiex.mk
+++ b/l10ntools/Executable_uiex.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_Executable_add_exception_objects,uiex,\
 $(eval $(call gb_Executable_use_externals,uiex,\
 libexslt \
 libxml2 \
+libxslt \
 ))
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Are the messages on the splash screen useful?

[Stephan Bergmann]

Terrence,

Any mails you sent to the list recently appear to be empty, not only for 
me locally but also at e.g. 
. 
 (Given that Ivan apparently quotes your message intact in another 
answer to this mail, maybe you sent it to both him personally and the 
list, and there's some problem on your end sending mails to the list?)


Stephan

On 09/27/2012 07:39 PM, Terrence Enger wrote:





--
View this message in context: 
http://nabble.documentfoundation.org/Are-the-messages-on-the-splash-screen-useful-tp4009651p4009681.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice



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

[Libreoffice-commits] .: slideshow/source

[Libreoffice Gerrit user]

 slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm  |2 +-
 slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ab4eb0e332a223b93f08a35b8885f34c8afbbb89
Author: Caolán McNamara 
Date:   Fri Sep 28 09:18:09 2012 +0100

SetPosSizePixel->setPosSizePixel

Change-Id: Id1cab5b27776180cd8403af848c1294858384b4a

diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm 
b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
index 3ebb6e6..963f072 100644
--- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
+++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
@@ -399,7 +399,7 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView( 
const Reference< presenta
 
 // needed in windowed mode only ?
 if( (aCanvasArea.X != 0) && (aCanvasArea.Y != 0) )
-pWindow->SetPosSizePixel(aCanvasArea.X, aCanvasArea.Y, 
aCanvasArea.Width, aCanvasArea.Height);
+pWindow->setPosSizePixel(aCanvasArea.X, aCanvasArea.Y, 
aCanvasArea.Width, aCanvasArea.Height);
 
 GLWin.Width = aCanvasArea.Width;
 GLWin.Height = aCanvasArea.Height;
diff --git a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx 
b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx
index 091dc20..1842dd4 100644
--- a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx
@@ -561,7 +561,7 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView( 
const Reference< presenta
 return false;
 
 awt::Rectangle aCanvasArea = mxView->getCanvasArea();
-pWindow->SetPosSizePixel(aCanvasArea.X, aCanvasArea.Y, aCanvasArea.Width, 
aCanvasArea.Height);
+pWindow->setPosSizePixel(aCanvasArea.X, aCanvasArea.Y, aCanvasArea.Width, 
aCanvasArea.Height);
 GLWin.Width = aCanvasArea.Width;
 GLWin.Height = aCanvasArea.Height;
 OSL_TRACE("canvas area: %d,%d - %dx%d", aCanvasArea.X, aCanvasArea.Y, 
aCanvasArea.Width, aCanvasArea.Height);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: translations/CustomTarget_translate.mk

[Libreoffice Gerrit user]

 translations/CustomTarget_translate.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 21da6a93b77e804b454792820c69c65f9e52c2a7
Author: Caolán McNamara 
Date:   Thu Sep 27 09:05:06 2012 +0100

add depend on uiex

diff --git a/translations/CustomTarget_translate.mk 
b/translations/CustomTarget_translate.mk
index 0bd41ef..7249e39 100644
--- a/translations/CustomTarget_translate.mk
+++ b/translations/CustomTarget_translate.mk
@@ -85,7 +85,7 @@ $(translations_DIR)/sdf-l10n/qtz.sdf : \
$(if $(findstring s,$(MAKEFLAGS)),> /dev/null))
 
 $(translations_DIR)/sdf-template/en-US.sdf : $(OUTDIR_FOR_BUILD)/bin/propex \
-   $(foreach exec,cfgex helpex localize transex3 ulfex xrmex, \
+   $(foreach exec,cfgex helpex localize transex3 uiex ulfex xrmex, 
\
$(call gb_Executable_get_target_for_build,$(exec)))
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),LOC,1)
$(call gb_Helper_abbreviate_dirs, \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: need help with unit test and process service factory

[Miklos Vajna]

On Fri, Sep 28, 2012 at 01:44:28AM +0200, Matúš Kukan  
wrote:
> Ah, that's not true. It should be for building,
> but I forgot that for unit test we need empathy with two jabber
> accounts configured.
> Is that too much for tinderbox ?

commit 49cec3fa6f25cdf2f24602696b6a94570cbbfc2f added a libreoffice user
profile for unit tests. Couldn't be a similar empathy profile added for
the tubes test?
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: codemaker/source

[Libreoffice Gerrit user]

 codemaker/source/cppumaker/cpputype.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a73656244f75099415efe1b671783eea9dcbe5f9
Author: Tor Lillqvist 
Date:   Fri Sep 28 10:05:28 2012 +0300

Add css.reflection.XTypeDescriptionEnumerationAccess to the bootstrap types

Needed for some unknown reason in a 64-bit Mac LO. Doesn't do any harm
to have it included everywhere.

Change-Id: I62ae599692bb922678caabe78b7e1c0588573bb2

diff --git a/codemaker/source/cppumaker/cpputype.cxx 
b/codemaker/source/cppumaker/cpputype.cxx
index 23b0bc6..f4f1304 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -119,6 +119,7 @@ bool isBootstrapType(rtl::OString const & name) {
 "com/sun/star/reflection/XMethodParameter",
 "com/sun/star/reflection/XStructTypeDescription",
 "com/sun/star/reflection/XTypeDescription",
+"com/sun/star/reflection/XTypeDescriptionEnumerationAccess",
 "com/sun/star/reflection/XUnionTypeDescription",
 "com/sun/star/registry/XImplementationRegistration",
 "com/sun/star/registry/XRegistryKey",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits