LibreOffice Gerrit News for core on 2014-01-09

[gerrit]

Moin!

* Open changes on master for project core changed in the last 25 hours:

 First time contributors doing great things ! 
+ upgrade liborcus
  in https://gerrit.libreoffice.org/7310 from Markus Mohrhard
  about module build, external, sc
+ fdo#73374 Trendline: correct R^2 for forced intercept
  in https://gerrit.libreoffice.org/7326 from Laurent BP
  about module chart2
+ fdo#72793 Add Excel 2010 functions
  in https://gerrit.libreoffice.org/7226 from Winfried Donkers
  about module formula, include, sc
+  fdo#73146 Add Excel 2010 functions
  in https://gerrit.libreoffice.org/7319 from Winfried Donkers
  about module formula, include, sc
+ re-write SvStream operator<< to non-overloaded methods
  in https://gerrit.libreoffice.org/7307 from Noel Grandin
  about module basic, compilerplugins, connectivity, dbaccess, editeng, 
extensions, filter, include, sc, sd, sfx2, sot, starmath, svl, svtools, svx, 
sw, toolkit, tools, vcl, writerfilter
+ Use filelist in some packages
  in https://gerrit.libreoffice.org/7311 from Marcos Souza
  about module scp2
+ Export MailMerge cancel functionality via UNO.
  in https://gerrit.libreoffice.org/7190 from Jan-Marek Glogowski
  about module offapi, sw
+ fdo#72563 : Pageref field tag not preserved
  in https://gerrit.libreoffice.org/7074 from Rajashri Udhoji
  about module sw
+ Keep in sync with desktop_strings[] in salplug.cxx
  in https://gerrit.libreoffice.org/7288 from Maxim Monastirsky
  about module vcl
 End of freshness 



* Merged changes on master for project core changed in the last 25 hours:

+ fdo#72219: Fix for corruption of symbols in docx
  in https://gerrit.libreoffice.org/6955 from Rohit Deshmukh
+ svt: Use constructor feature for ODocumentCloser.
  in https://gerrit.libreoffice.org/7186 from Matúš Kukan
+ fdo#73034: Fix for Extra spacing in document.
  in https://gerrit.libreoffice.org/7216 from Rohit Deshmukh


* Abandoned changes on master for project core changed in the last 25 hours:

+ Swap default button in alien format save warning UI
  in https://gerrit.libreoffice.org/7308 from Olivier Hallot


* Open changes needing tweaks, but being untouched for more than a week:

+ Export CoreText-related SPI stuff
  in https://gerrit.libreoffice.org/7143 from Douglas Mencken
+ remove BluetoothOperator wrapper
  in https://gerrit.libreoffice.org/7092 from Christian Lohmaier
+ fix previous commit
  in https://gerrit.libreoffice.org/7101 from Markus Mohrhard
+ CID#736173: Out-of-bound read
  in https://gerrit.libreoffice.org/6973 from Julien Nabet
+ move from ActionBarSherlock to corresponding android support lib
  in https://gerrit.libreoffice.org/7082 from Christian Lohmaier
+ fdo#60698: Merge animcore into sd and slideshow
  in https://gerrit.libreoffice.org/7108 from Marcos Souza
+ fix Bluetooth lifecycle problems and respect UI guidelines
  in https://gerrit.libreoffice.org/7083 from Christian Lohmaier
+ Double toolbar icon size for HiDPI screens.
  in https://gerrit.libreoffice.org/6994 from Andrzej Hunt
+ sw/export docx: add unit test for document with header and section(s)
  in https://gerrit.libreoffice.org/6249 from Pierre-Eric Pelloux-Prayer
+ add a header to provide posix compatible wrapper for platform lacking
  in https://gerrit.libreoffice.org/6837 from Norbert Thiebaud
+ Code clean-up/consolidation task.
  in https://gerrit.libreoffice.org/5926 from Vishv Brahmbhatt
+ fix for exporting of text watermark to DOCX
  in https://gerrit.libreoffice.org/5568 from Adam CloudOn
+ WIP: fdo#33980 Preserve selection across all slide sorters.
  in https://gerrit.libreoffice.org/6633 from Andrzej Hunt
+ fdo#71043 -  Use STACK lint tool to clean code
  in https://gerrit.libreoffice.org/6529 from José Guilherme Vanz
+ Increase number of remembered recent documents from 10 to 25
  in https://gerrit.libreoffice.org/6101 from Krisztian Pinter
+ startcenter: Make SC open faster by timeouting thumbnails
  in https://gerrit.libreoffice.org/6102 from Krisztian Pinter
+ Simplify oslThreadIdentifier on Linux 32.
  in https://gerrit.libreoffice.org/5553 from Arnaud Versini
+ Dynamically align toolbars in LibreOffice
  in https://gerrit.libreoffice.org/5655 from Prashant Pandey
+ fdo#36791 : fix for import of greeting card
  in https://gerrit.libreoffice.org/4240 from Adam CloudOn
+ more debug logs, extra debug layer, file is not used in p3k
  in https://gerrit.libreoffice.org/5267 from James Michael Dupont
+ Positional Tab additions
  in https://gerrit.libreoffice.org/5387 from Adam CloudOn
+ fdo#64817 : fix for rectangle with image fill
  in https://gerrit.libreoffice.org/4718 from Adam CloudOn


Best,

Your friendly LibreOffice Gerrit Digest Mailer

Note: The bot generating this message can be found and improved here:
   
https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/globalnames.hxx |4 
 sc/source/core/tool/formulagroup.cxx   |3 ++-
 sc/source/ui/optdlg/calcoptionsdlg.cxx |   15 +--
 3 files changed, 15 insertions(+), 7 deletions(-)

New commits:
commit ea38aead924caeae9d51dec5246fef27f4fa456e
Author: Kohei Yoshida 
Date:   Wed Jan 8 14:43:39 2014 -0500

fdo#73408: Make the software interpreter selection stick in the UI.

Change-Id: I136a98fadbde82a7a585df9a5691f884c0362699
(cherry picked from commit 4b5a98942cd3ebcdacd4d66fb2bd61211fcfe7bc)
Reviewed-on: https://gerrit.libreoffice.org/7323
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/sc/inc/globalnames.hxx b/sc/inc/globalnames.hxx
index a7f0053..336bee6 100644
--- a/sc/inc/globalnames.hxx
+++ b/sc/inc/globalnames.hxx
@@ -23,6 +23,10 @@
 // set (in nScriptType) if type has not been determined yet
 #define SC_SCRIPTTYPE_UNKNOWN 0x08
 
+// Device name used to represent the software group interpreter for OpenCL
+// mode. This string gets stored in use configuration as the device name.
+#define OPENCL_SOFTWARE_DEVICE_CONFIG_NAME "Software"
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/tool/formulagroup.cxx 
b/sc/source/core/tool/formulagroup.cxx
index ab60336..f58f7dc 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -16,6 +16,7 @@
 #include "compiler.hxx"
 #include "interpre.hxx"
 #include "scmatrix.hxx"
+#include "globalnames.hxx"
 
 #include "formula/vectortoken.hxx"
 #include "rtl/bootstrap.hxx"
@@ -593,7 +594,7 @@ void 
FormulaGroupInterpreter::fillOpenCLInfo(std::vector& rP
 bool FormulaGroupInterpreter::switchOpenCLDevice(const OUString& rDeviceId, 
bool bAutoSelect, bool bForceEvaluation)
 {
 bool bOpenCLEnabled = ScInterpreter::GetGlobalConfig().mbOpenCLEnabled;
-if(!bOpenCLEnabled || rDeviceId == "Software")
+if (!bOpenCLEnabled || rDeviceId == OPENCL_SOFTWARE_DEVICE_CONFIG_NAME)
 {
 if(msInstance)
 {
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx 
b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index eefb7f6..79ca879 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -16,6 +16,7 @@
 
 #if HAVE_FEATURE_OPENCL
 #include "formulagroup.hxx"
+#include "globalnames.hxx"
 #endif
 
 namespace {
@@ -200,7 +201,7 @@ void ScCalcOptionsDialog::fillOpenclList()
 {
 mpOpenclInfoList->SetUpdateMode(false);
 mpOpenclInfoList->Clear();
-mpOpenclInfoList->InsertEntry(maSoftware);
+SvTreeListEntry* pSoftwareEntry = 
mpOpenclInfoList->InsertEntry(maSoftware);
 
 OUString aStoredDevice = maConfig.maOpenCLDevice;
 
@@ -225,10 +226,12 @@ void ScCalcOptionsDialog::fillOpenclList()
 
 mpOpenclInfoList->SetUpdateMode(true);
 mpOpenclInfoList->GetModel()->GetView(0)->SelectAll(false, false);
-if(pSelectedEntry)
-{
-mpOpenclInfoList->GetModel()->GetView(0)->Select(pSelectedEntry);
-}
+
+if (pSelectedEntry)
+mpOpenclInfoList->Select(pSelectedEntry);
+else if (aStoredDevice == OPENCL_SOFTWARE_DEVICE_CONFIG_NAME)
+mpOpenclInfoList->Select(pSoftwareEntry);
+
 SelectedDeviceChanged();
 }
 
@@ -404,7 +407,7 @@ void ScCalcOptionsDialog::SelectedDeviceChanged()
 OUString aDevice = 
dynamic_cast(pEntry->GetItem(1))->GetText();
 // use english string for configuration
 if(aDevice == maSoftware)
-aDevice = "Software";
+aDevice = OPENCL_SOFTWARE_DEVICE_CONFIG_NAME;
 
 maConfig.maOpenCLDevice = aDevice;
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[haochen]

 sc/source/core/opencl/formulagroupcl.cxx |  288 ++-
 1 file changed, 243 insertions(+), 45 deletions(-)

New commits:
commit 0d7c2ca065e0b0204f1e84ffe624b89d760d1ca8
Author: haochen 
Date:   Thu Jan 9 09:34:38 2014 +0800

GPU Calc: support reduction kernel in AVERAGE

Change-Id: I0ae0fb279d6d14637d23c682d546a8cc95bc371d
Signed-off-by: haochen 
Signed-off-by: I-Jui (Ray) Sung 

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 6e347bd..dbedfa2 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -761,6 +761,45 @@ protected:
 DynamicKernelSlidingArgument mDoubleArgument;
 DynamicKernelSlidingArgument mStringArgument;
 };
+/// Holds the symbol table for a given dynamic kernel
+class SymbolTable {
+public:
+typedef std::map > ArgumentMap;
+// This avoids instability caused by using pointer as the key type
+typedef std::list< boost::shared_ptr > ArgumentList;
+SymbolTable(void):mCurId(0) {}
+template 
+const DynamicKernelArgument *DeclRefArg(FormulaTreeNodeRef, 
SlidingFunctionBase* pCodeGen);
+/// Used to generate sliding window helpers
+void DumpSlidingWindowFunctions(std::stringstream &ss)
+{
+for(ArgumentList::iterator it = mParams.begin(), e= mParams.end(); 
it!=e;
+++it) {
+(*it)->GenSlidingWindowFunction(ss);
+ss << "\n";
+}
+}
+/// Memory mapping from host to device and pass buffers to the given 
kernel as
+/// arguments
+void Marshal(cl_kernel, int, cl_program);
+// number of result items.
+static int nR;
+private:
+unsigned int mCurId;
+ArgumentMap mSymbols;
+ArgumentList mParams;
+};
+int SymbolTable::nR = 0;
+
+void SymbolTable::Marshal(cl_kernel k, int nVectorWidth, cl_program pProgram)
+{
+int i = 1; //The first argument is reserved for results
+for(ArgumentList::iterator it = mParams.begin(), e= mParams.end(); it!=e;
+++it) {
+i+=(*it)->Marshal(k, i, nVectorWidth, pProgram);
+}
+}
 
 /// Handling a Double Vector that is used as a sliding window input
 /// Performs parallel reduction based on given operator
@@ -783,6 +822,8 @@ public:
 }
 /// Emit the definition for the auxiliary reduction kernel
 virtual void GenSlidingWindowFunction(std::stringstream &ss) {
+  if ( !dynamic_cast(mpCodeGen.get()))
+  {
 std::string name = Base::GetName();
 ss << "__kernel void "IsStartFixed())
+ss << "int offset = get_group_id(1);\n";
+if (mpDVR->IsStartFixed() && mpDVR->IsEndFixed())
+ss << "int end = windowSize;\n";
+else if (!mpDVR->IsStartFixed() && !mpDVR->IsEndFixed())
+ss << "int end = offset + windowSize;\n";
+else if (mpDVR->IsStartFixed() && !mpDVR->IsEndFixed())
+ss << "int end = windowSize + get_group_id(1);\n";
+else if (!mpDVR->IsStartFixed() && mpDVR->IsEndFixed())
+ss << "int end = windowSize;\n";
+ss << "end = min(end, arrayLength);\n";
+ss << "barrier(CLK_LOCAL_MEM_FENCE);\n";
+ss << "int loop = arrayLength/512 + 1;\n";
+ss << "for (int l=0; l0; i/=2) {\n";
+ss << "if (lidx < i)\n";
+ss << "shm_buf[lidx] = ";
+ss << "shm_buf[lidx] + shm_buf[lidx + i];\n";
+ss << "barrier(CLK_LOCAL_MEM_FENCE);\n";
+ss << "}\n";
+ss << "if (lidx == 0)\n";
+ss << "current_result =";
+ss << "current_result + shm_buf[0]";
+ss << ";\n";
+ss << "barrier(CLK_LOCAL_MEM_FENCE);\n";
+ss << "}\n";
+ss << "if (lidx == 0)\n";
+ss << "result[writePos] = current_result;\n";
+ss << "}\n";
+/*count reduction*/
+ss << "__kernel void "IsStartFixed())
+ss << "int offset = get_group_id(1);\n";
+if (mpDVR->IsStartFixed() && mpDVR->IsEndFixed())
+ss << "int end = windowSize;\n";
+else if (!mpDVR->IsStartFixed() && !mpDVR->IsEndFixed())
+ss << "int end = offset + windowSize;\n";
+else if (mpDVR->IsStartFixed() && !mpDVR->IsEndFixed())
+ss << "int end = windowSize + get_group_id(1);\n";
+else if (!mpDVR->IsStartFixed() && mpDVR->IsEndFixed())
+ss << "int end = windowSize;\n";
+ss << "end = min(end, arrayLength);\n";
+ss << "barrier(CLK_LOCAL_MEM_FENCE);\n";
+ss << "int loop = arrayLength/512 + 1;\n";
+ss << "for (int l=0; l0; i/=2) {\n";
+ss << "if (lidx < i)\n";
+ss << " 

Write unittest for style method isInUse

[Marcos Paulo de souza]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Hi people,

There is a test can I can look to understand how to create a test with
macros?

I want to write a unittest to
https://bugs.freedesktop.org/show_bug.cgi?id=70807, so I just need a
code pointer to write this test.

Thanks since now!

Regards,
Marcos
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.22 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQEcBAEBAgAGBQJSzfOxAAoJEIqCNZtY966qK7cIAIbMcdMnjG/k/q3OlT0R2OqI
U+w7sfstZ9o9ar89A2CGL/4y+a0RwhH66E0ILqdyQKug3yC9cn+9CqDbCjoimWLu
+y6UgN9TaEbdtc9Txf4GPIAl3U9G8FZlHOn60NzJMBWp1ALL//BQEH71PhezLbs0
y1rbBj1hM1Qa6X0nnHnBRayhhZ34/Uv/GsdxUMAuvdvDP1kLxMI5Vub2Yuhrzkgs
PhfAjC5tpRhiaCWkkLh7TBlyZUvRLqLpPOVrIH29KQ+N4i7645d4GBn64OLJKYBH
9VF2fkS+wQhqReDI4ppZ8pLbnlmklpxBfgxj7S4IqwAtKOTOapIomWmAon+edm8=
=2PEG
-END PGP SIGNATURE-

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - configure.ac download.lst python3/ExternalPackage_python3.mk python3/i100492-freebsd.patch.1 python3/python-3.3.0-15833.patch.1 python3/pytho

[Michael Stahl]

 configure.ac   |2 
 download.lst   |2 
 python3/ExternalPackage_python3.mk |   14 +-
 python3/UnpackedTarball_python3.mk |   11 --
 python3/i100492-freebsd.patch.1|2 
 python3/python-3.3.0-15833.patch.1 |   25 -
 python3/python-3.3.0-aix.patch.1   |  156 -
 python3/python-3.3.0-elf-rpath.patch.1 |   13 --
 python3/python-3.3.0-ffi-clang.patch.1 |   40 
 python3/python-3.3.3-aix.patch.1   |  145 ++
 python3/python-3.3.3-elf-rpath.patch.1 |   13 ++
 11 files changed, 170 insertions(+), 253 deletions(-)

New commits:
commit 5d207e1a819a679738e0299972cef3d280122596
Author: Michael Stahl 
Date:   Mon Jan 6 16:05:56 2014 +0100

fdo#73087: python3: upgrade to version 3.3.3

- drop obsolete/upstreamed patches:
  python-3.3.0-ffi-clang.patch.1
  python-3.3.0-15833.patch.1
  one hunk of python-3.3.0-aix.patch.1 in fficonfig.py.in

Reviewed-on: https://gerrit.libreoffice.org/7278
Tested-by: LibreOffice gerrit bot 
Reviewed-by: Michael Stahl 
(cherry picked from commit 45c537a1185dfca7e51229dde9e9220e5174bd57)

Conflicts:
external/python3/python-3.3.0-aix.patch.1
external/python3/python-3.3.0-elf-rpath.patch.1
external/python3/python-3.3.3-aix.patch.1
external/python3/python-3.3.3-elf-rpath.patch.1
python3/ExternalPackage_python3.mk
python3/UnpackedTarball_python3.mk
python3/python-3.3.0-15833.patch.1
python3/python-3.3.0-aix.patch.1
python3/python-3.3.0-elf-rpath.patch.1
python3/python-3.3.0-ffi-clang.patch.1

Change-Id: I12f0f78a172067986b63455847015ea2430a084c
Reviewed-on: https://gerrit.libreoffice.org/7290
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/configure.ac b/configure.ac
index 4db89a0..0efa57f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7577,7 +7577,7 @@ internal)
 SYSTEM_PYTHON=NO
 PYTHON_VERSION_MAJOR=3
 PYTHON_VERSION_MINOR=3
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.0
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.3
 BUILD_TYPE="$BUILD_TYPE PYTHON"
 # Embedded Python dies without Home set
 if test "$HOME" = ""; then
diff --git a/download.lst b/download.lst
index ea91017..789221f 100644
--- a/download.lst
+++ b/download.lst
@@ -77,7 +77,7 @@ export ORCUS_TARBALL := 
ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2
 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
 export PNG_TARBALL := 9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz
 export POSTGRESQL_TARBALL := 
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
-export PYTHON_TARBALL := b3b2524f72409d919a4137826a870a8f-Python-3.3.0.tar.bz2
+export PYTHON_TARBALL := f3ebe34d4d8695bf889279b54673e10c-Python-3.3.3.tar.bz2
 export RAPTOR_TARBALL := 4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz
 export RASQAL_TARBALL := b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz
 export REDLAND_TARBALL := 
32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz
diff --git a/python3/ExternalPackage_python3.mk 
b/python3/ExternalPackage_python3.mk
index 597062c..3cd2126 100644
--- a/python3/ExternalPackage_python3.mk
+++ b/python3/ExternalPackage_python3.mk
@@ -116,6 +116,13 @@ endif
 # headers are not delivered, but used from unpacked dir Include/
 # (+ toplevel for pyconfig.h)
 
+# that one is generated...
+ifneq ($(OS)-$(COM),WNT-MSC)
+$(eval $(call 
gb_ExternalPackage_add_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib,\
+   LO_lib/_sysconfigdata.py \
+))
+endif
+
 # packages not shipped:
 # dbm, sqlite3 - need some database stuff
 # curses - need curses to build the C module
@@ -150,13 +157,6 @@ $(eval $(call 
gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAM
Lib/plat-aix4/IN.py \
 ))
 
-# that one is generated...
-ifneq ($(OS)-$(COM),WNT-MSC)
-$(eval $(call 
gb_ExternalPackage_add_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib,\
-   Lib/_sysconfigdata.py \
-))
-endif
-
 $(eval $(call 
gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib,\
LICENSE \
Lib/__future__.py \
diff --git a/python3/UnpackedTarball_python3.mk 
b/python3/UnpackedTarball_python3.mk
index 0d5fce5..9bf6961 100644
--- a/python3/UnpackedTarball_python3.mk
+++ b/python3/UnpackedTarball_python3.mk
@@ -22,27 +22,20 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,python3,\
 $(eval $(call gb_UnpackedTarball_add_patches,python3,\
python3/i100492-freebsd.patch.1 \
python3/python-3.3.0-i42553.patch.2 \
-   python3/python-3.3.0-aix.patch.1 \
+   python3/python-3.3.3-aix.patch.1 \
python3/python-3.3.0-darwin.patch.1 \
python3/python-3.3.0-

[Libreoffice-commits] core.git: sc/inc sc/source

[Kohei Yoshida]

 sc/inc/documentlinkmgr.hxx|1 +
 sc/source/ui/docshell/documentlinkmgr.cxx |5 +
 2 files changed, 6 insertions(+)

New commits:
commit 51bce89dbd620d3ed59279d0ae80e5587d723bef
Author: Kohei Yoshida 
Date:   Wed Jan 8 16:33:42 2014 -0500

Oops. We don't want to leak here.

Change-Id: I8bcca7d743d4be7038a4c2eb1436a6470774d40d

diff --git a/sc/inc/documentlinkmgr.hxx b/sc/inc/documentlinkmgr.hxx
index 2206dfb..5de8dcd 100644
--- a/sc/inc/documentlinkmgr.hxx
+++ b/sc/inc/documentlinkmgr.hxx
@@ -32,6 +32,7 @@ class DocumentLinkManager : boost::noncopyable
 
 public:
 DocumentLinkManager( ScDocument& rDoc, SfxObjectShell* pShell );
+~DocumentLinkManager();
 
 void setDataStream( DataStream* p );
 DataStream* getDataStream();
diff --git a/sc/source/ui/docshell/documentlinkmgr.cxx 
b/sc/source/ui/docshell/documentlinkmgr.cxx
index 399e15e..6ece6b4 100644
--- a/sc/source/ui/docshell/documentlinkmgr.cxx
+++ b/sc/source/ui/docshell/documentlinkmgr.cxx
@@ -44,6 +44,11 @@ struct DocumentLinkManagerImpl : boost::noncopyable
 DocumentLinkManager::DocumentLinkManager( ScDocument& rDoc, SfxObjectShell* 
pShell ) :
 mpImpl(new DocumentLinkManagerImpl(rDoc, pShell)) {}
 
+DocumentLinkManager::~DocumentLinkManager()
+{
+delete mpImpl;
+}
+
 void DocumentLinkManager::setDataStream( DataStream* p )
 {
 mpImpl->mpDataStream.reset(p);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/inc sc/source

[Kohei Yoshida]

 sc/inc/document.hxx   |4 
 sc/inc/documentlinkmgr.hxx|   21 +
 sc/source/core/data/documen2.cxx  |   37 --
 sc/source/core/data/documen8.cxx  |  387 --
 sc/source/core/data/documen9.cxx  |7 
 sc/source/ui/docshell/documentlinkmgr.cxx |   36 ++
 sc/source/ui/inc/areasave.hxx |5 
 sc/source/ui/undo/areasave.cxx|   16 -
 8 files changed, 293 insertions(+), 220 deletions(-)

New commits:
commit 8fde2885236d5490be8f54e96dfe4a63d9bb9dec
Author: Kohei Yoshida 
Date:   Wed Jan 8 16:29:35 2014 -0500

Move the LinkManager instance from ScDocument to ScDocumentLinkManager.

Change-Id: I096322fa200abed5bacc786c1abc57a3ec51276f

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 0b7fe1d..b3d2a92 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -280,7 +280,6 @@ private:
 ScChartCollection*  pChartCollection;
 std::auto_ptr< ScTemporaryChartLock > apTemporaryChartLock;
 ScPatternAttr*  pSelectionAttr; // Attributes of a 
block
-mutable sfx2::LinkManager*  pLinkManager;
 ScFormulaCell*  pFormulaTree;   // formula tree (start)
 ScFormulaCell*  pEOFormulaTree; // formula tree (end), 
last cell
 ScFormulaCell*  pFormulaTrack;  // BroadcastTrack 
(start)
@@ -469,7 +468,8 @@ public:
 SC_DLLPUBLIC void  InitDrawLayer( SfxObjectShell* pDocShell = NULL );
 rtl::Reference  GetColorList();
 
-SC_DLLPUBLIC sfx2::LinkManager* GetLinkManager() const;
+SC_DLLPUBLIC sfx2::LinkManager* GetLinkManager();
+SC_DLLPUBLIC const sfx2::LinkManager* GetLinkManager() const;
 
 sc::DocumentLinkManager& GetDocLinkManager();
 const sc::DocumentLinkManager& GetDocLinkManager() const;
diff --git a/sc/inc/documentlinkmgr.hxx b/sc/inc/documentlinkmgr.hxx
index ead5698..2206dfb 100644
--- a/sc/inc/documentlinkmgr.hxx
+++ b/sc/inc/documentlinkmgr.hxx
@@ -12,6 +12,15 @@
 
 #include 
 
+class ScDocument;
+class SfxObjectShell;
+
+namespace sfx2 {
+
+class LinkManager;
+
+}
+
 namespace sc {
 
 class DataStream;
@@ -22,11 +31,21 @@ class DocumentLinkManager : boost::noncopyable
 DocumentLinkManagerImpl* mpImpl;
 
 public:
-DocumentLinkManager();
+DocumentLinkManager( ScDocument& rDoc, SfxObjectShell* pShell );
 
 void setDataStream( DataStream* p );
 DataStream* getDataStream();
 const DataStream* getDataStream() const;
+
+/**
+ * @param bCreate if true, create a new link manager instance in case one
+ *does not exist.
+ *
+ * @return link manager instance.
+ */
+sfx2::LinkManager* getLinkManager( bool bCreate = true );
+
+const sfx2::LinkManager* getExistingLinkManager() const;
 };
 
 }
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 8803d25..eeb04b1 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -139,7 +139,6 @@ ScDocument::ScDocument( ScDocumentMode eMode, 
SfxObjectShell* pDocShell ) :
 pFormatExchangeList( NULL ),
 pRangeName(NULL),
 pDPCollection( NULL ),
-pLinkManager( NULL ),
 pFormulaTree( NULL ),
 pEOFormulaTree( NULL ),
 pFormulaTrack( NULL ),
@@ -228,9 +227,6 @@ ScDocument::ScDocument( ScDocumentMode eMode, 
SfxObjectShell* pDocShell ) :
 
 if ( eMode == SCDOCMODE_DOCUMENT )
 {
-if ( pDocShell )
-pLinkManager = new sfx2::LinkManager( pDocShell );
-
 xPoolHelper = new ScPoolHelper( this );
 
 pBASM = new ScBroadcastAreaSlotMachine( this );
@@ -257,27 +253,26 @@ ScDocument::ScDocument( ScDocumentMode eMode, 
SfxObjectShell* pDocShell ) :
 aTrackTimer.SetTimeout( 100 );
 }
 
-sfx2::LinkManager*  ScDocument::GetLinkManager()  const
+sfx2::LinkManager* ScDocument::GetLinkManager()
 {
-if ( bAutoCalc && !pLinkManager && pShell)
-{
-pLinkManager = new sfx2::LinkManager( pShell );
-}
-return pLinkManager;
+return GetDocLinkManager().getLinkManager(bAutoCalc);
+}
+
+const sfx2::LinkManager* ScDocument::GetLinkManager() const
+{
+return GetDocLinkManager().getExistingLinkManager();
 }
 
 sc::DocumentLinkManager& ScDocument::GetDocLinkManager()
 {
 if (!mpDocLinkMgr)
-mpDocLinkMgr.reset(new sc::DocumentLinkManager);
+mpDocLinkMgr.reset(new sc::DocumentLinkManager(*this, pShell));
 return *mpDocLinkMgr;
 }
 
 const sc::DocumentLinkManager& ScDocument::GetDocLinkManager() const
 {
-if (!mpDocLinkMgr)
-mpDocLinkMgr.reset(new sc::DocumentLinkManager);
-return *mpDocLinkMgr;
+return const_cast(this)->GetDocLinkManager();
 }
 
 void ScDocument::SetStorageGrammar( formula::FormulaGrammar::Grammar eGram )
@@ -386,19 +381,6 @@ ScDocument::~ScDocument()
 delete pRefreshTimerControl, pRefreshTimerControl = NULL;
 }
 
-//

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

[Matúš Kukan]

 svtools/source/uno/fpicker.cxx |   12 ++--
 1 file changed, 2 insertions(+), 10 deletions(-)

New commits:
commit eb89c6f7dcd613cda6a9eee6f7897225e0334a25
Author: Matúš Kukan 
Date:   Wed Jan 8 22:02:08 2014 +0100

Do not initialize FilePicker with empty argument.

This is tricky.
In constructor, we don't know if we were called by service manager's
createInstanceWithArgumentsAndContext or just createInstanceWithContext,
so we don't know if initialize should be called.
Let's assume that nobody would use createInstanceWithArgumentsAndContext
with empty argument. Then the behaviour should be the same as before.

FolderPicker does not seem to be called with arguments.

Change-Id: If33dc20fe1b2b10b092ff35fa0b258137c8e94b2

diff --git a/svtools/source/uno/fpicker.cxx b/svtools/source/uno/fpicker.cxx
index 7a4b769..9ff1f6d 100644
--- a/svtools/source/uno/fpicker.cxx
+++ b/svtools/source/uno/fpicker.cxx
@@ -94,7 +94,7 @@ com_sun_star_comp_svt_FilePicker_get_implementation(
 svt::addFilePicker (xResult);
 }
 css::uno::Reference< css::lang::XInitialization > xx(xResult, 
css::uno::UNO_QUERY);
-if (xx.is())
+if (xx.is() && arguments->nElements)
 {
 css::uno::Sequence aArgs(
 reinterpret_cast(arguments->elements),
@@ -126,7 +126,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * 
SAL_CALL
 com_sun_star_comp_svt_FolderPicker_get_implementation(
 css::uno::XComponentContext *context, uno_Sequence * arguments)
 {
-assert(arguments != 0);
+assert(arguments != 0 && arguments->nElements == 0); (void) arguments;
 Reference< css::uno::XInterface > xResult;
 Reference< css::lang::XMultiComponentFactory > xFactory 
(context->getServiceManager());
 if (xFactory.is() && SvtMiscOptions().UseSystemFileDialog())
@@ -158,14 +158,6 @@ com_sun_star_comp_svt_FolderPicker_get_implementation(
 // Add to FolderPicker history.
 svt::addFolderPicker (xResult);
 }
-css::uno::Reference< css::lang::XInitialization > xx(xResult, 
css::uno::UNO_QUERY);
-if (xx.is())
-{
-css::uno::Sequence aArgs(
-reinterpret_cast(arguments->elements),
-arguments->nElements);
-xx->initialize(aArgs);
-}
 xResult->acquire();
 return xResult.get();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 3cb4aa944afe335da373b3e0bafea5360cb8d665
Author: Caolán McNamara 
Date:   Wed Jan 8 21:01:48 2014 +

Resolves: rhbz#1050162 don't draw to NULL window

Change-Id: Ia84e3ae05f2d3eacfb48136ce920173b46783bc7

diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 14f6d7a..4c00db5 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -782,7 +782,6 @@ sal_Bool GtkSalGraphics::drawNativeControl(ControlType 
nType,
 const ImplControlValue& aValue,
 const OUString& rCaption )
 {
-sal_BoolreturnVal = sal_False;
 // get a GC with current clipping region set
 GetFontGC();
 
@@ -839,6 +838,11 @@ sal_Bool GtkSalGraphics::drawNativeControl(ControlType 
nType,
 }
 }
 
+assert(gdkDrawable); //rhbz#1050162
+if (gdkDrawable == 0)
+return false;
+
+sal_BoolreturnVal = sal_False;
 if ( (nType==CTRL_PUSHBUTTON) && (nPart==PART_ENTIRE_CONTROL) )
 {
 returnVal = NWPaintGTKButton( gdkDrawable, nType, nPart, aCtrlRect, 
aClip, nState, aValue, rCaption );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 sc/source/core/opencl/formulagroupcl.cxx |9 ++---
 1 file changed, 2 insertions(+), 7 deletions(-)

New commits:
commit 91b2be943e544a2e5c9e98f9ee7b816c40d1f076
Author: Kohei Yoshida 
Date:   Wed Jan 8 14:55:40 2014 -0500

Cleanup.

Change-Id: Ia2440fb0e81786bc82fc982fcb4da7bbc70e014b

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 38c91a9..6e347bd 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -3356,20 +3356,15 @@ bool FormulaGroupInterpreterOpenCL::interpret( 
ScDocument& rDoc,
 #endif
 }
 return true;
-} // namespace opencl
+}
 
-}} // namespace sc
+}} // namespace sc::opencl
 
 extern "C" {
 
 SAL_DLLPUBLIC_EXPORT sc::FormulaGroupInterpreter* SAL_CALL
createFormulaGroupOpenCLInterpreter()
 {
-#if 0// USE_GROUNDWATER_INTERPRETER
-if (getenv("SC_GROUNDWATER"))
-return new sc::opencl::FormulaGroupInterpreterGroundwater();
-#endif
-
 return new sc::opencl::FormulaGroupInterpreterOpenCL();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Rohit Deshmukh]

 i18npool/qa/cppunit/test_breakiterator.cxx|   19 ++-
 i18npool/source/breakiterator/xdictionary.cxx |6 --
 2 files changed, 22 insertions(+), 3 deletions(-)

New commits:
commit 2421317990d00e14325298f34db3c60735527697
Author: Rohit Deshmukh 
Date:   Fri Dec 6 15:42:53 2013 +0530

fdo#72219: Fix for corruption of symbols in docx

Issue:
OUString uses UTF-16, so for a Unicode surrogate character there are 2
values stored, not just 1.
So we are getting assert failure in "rtl_uString_iterateCodePoints" method.

erAck: Underlying cause was that the dictionary breakiterator misused
UTF-16 positions as Unicode code point positions.

Change-Id: I923485f56c2d879b63687adaea2b489a3479991c
Reviewed-on: https://gerrit.libreoffice.org/6955
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit d8fd15875901d584a4bbcc07c927fa20332e4841)
Reviewed-on: https://gerrit.libreoffice.org/7322
(cherry picked from commit 994d0c9e7aa8d1a7602e61b770991da980c1cde5)
Reviewed-on: https://gerrit.libreoffice.org/7324

diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx 
b/i18npool/qa/cppunit/test_breakiterator.cxx
index 41e4077..b4174ba 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -44,7 +44,7 @@ public:
 #endif
 void testKhmer();
 void testJapanese();
-
+void testChinese();
 CPPUNIT_TEST_SUITE(TestBreakIterator);
 CPPUNIT_TEST(testLineBreaking);
 CPPUNIT_TEST(testGraphemeIteration);
@@ -60,6 +60,7 @@ public:
 CPPUNIT_TEST(testKhmer);
 #endif
 CPPUNIT_TEST(testJapanese);
+CPPUNIT_TEST(testChinese);
 CPPUNIT_TEST_SUITE_END();
 private:
 uno::Reference m_xBreak;
@@ -909,6 +910,22 @@ void TestBreakIterator::testJapanese()
 }
 }
 
+void TestBreakIterator::testChinese()
+{
+lang::Locale aLocale;
+aLocale.Language = "zh";
+aLocale.Country = "CN";
+i18n::Boundary aBounds;
+
+{
+const sal_Unicode CHINESE[] = { 0x6A35, 0x6A30, 0x69FE, 0x8919, 
0xD867, 0xDEDB  };
+
+OUString aTest(CHINESE, SAL_N_ELEMENTS(CHINESE));
+aBounds = m_xBreak->getWordBoundary(aTest, 4, aLocale,
+i18n::WordType::DICTIONARY_WORD, true);
+CPPUNIT_ASSERT(aBounds.startPos == 4 && aBounds.endPos == 6);
+}
+}
 void TestBreakIterator::setUp()
 {
 BootstrapFixtureBase::setUp();
diff --git a/i18npool/source/breakiterator/xdictionary.cxx 
b/i18npool/source/breakiterator/xdictionary.cxx
index 72da09f..3b43fa3 100644
--- a/i18npool/source/breakiterator/xdictionary.cxx
+++ b/i18npool/source/breakiterator/xdictionary.cxx
@@ -383,9 +383,11 @@ Boundary xdictionary::getWordBoundary(const OUString& 
rText, sal_Int32 anyPos, s
 if (u_isWhitespace(ch))
 i--;
 }
+
 boundary.endPos = boundary.startPos;
-rText.iterateCodePoints(&boundary.endPos, aCache.wordboundary[i]);
-rText.iterateCodePoints(&boundary.startPos, 
aCache.wordboundary[i-1]);
+boundary.endPos += aCache.wordboundary[i];
+boundary.startPos += aCache.wordboundary[i-1];
+
 } else {
 boundary.startPos = anyPos;
 if (anyPos < len) rText.iterateCodePoints(&anyPos, 1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Rohit Deshmukh]

 i18npool/qa/cppunit/test_breakiterator.cxx|   19 ++-
 i18npool/source/breakiterator/xdictionary.cxx |6 --
 2 files changed, 22 insertions(+), 3 deletions(-)

New commits:
commit 994d0c9e7aa8d1a7602e61b770991da980c1cde5
Author: Rohit Deshmukh 
Date:   Fri Dec 6 15:42:53 2013 +0530

fdo#72219: Fix for corruption of symbols in docx

Issue:
OUString uses UTF-16, so for a Unicode surrogate character there are 2
values stored, not just 1.
So we are getting assert failure in "rtl_uString_iterateCodePoints" method.

erAck: Underlying cause was that the dictionary breakiterator misused
UTF-16 positions as Unicode code point positions.

Change-Id: I923485f56c2d879b63687adaea2b489a3479991c
Reviewed-on: https://gerrit.libreoffice.org/6955
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit d8fd15875901d584a4bbcc07c927fa20332e4841)
Reviewed-on: https://gerrit.libreoffice.org/7322

diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx 
b/i18npool/qa/cppunit/test_breakiterator.cxx
index 15ce8a1..2c595cf 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -45,7 +45,7 @@ public:
 #endif
 void testKhmer();
 void testJapanese();
-
+void testChinese();
 CPPUNIT_TEST_SUITE(TestBreakIterator);
 CPPUNIT_TEST(testLineBreaking);
 CPPUNIT_TEST(testGraphemeIteration);
@@ -64,6 +64,7 @@ public:
 CPPUNIT_TEST(testLao);
 #endif
 CPPUNIT_TEST(testJapanese);
+CPPUNIT_TEST(testChinese);
 CPPUNIT_TEST_SUITE_END();
 private:
 uno::Reference m_xBreak;
@@ -938,6 +939,22 @@ void TestBreakIterator::testJapanese()
 }
 }
 
+void TestBreakIterator::testChinese()
+{
+lang::Locale aLocale;
+aLocale.Language = "zh";
+aLocale.Country = "CN";
+i18n::Boundary aBounds;
+
+{
+const sal_Unicode CHINESE[] = { 0x6A35, 0x6A30, 0x69FE, 0x8919, 
0xD867, 0xDEDB  };
+
+OUString aTest(CHINESE, SAL_N_ELEMENTS(CHINESE));
+aBounds = m_xBreak->getWordBoundary(aTest, 4, aLocale,
+i18n::WordType::DICTIONARY_WORD, true);
+CPPUNIT_ASSERT(aBounds.startPos == 4 && aBounds.endPos == 6);
+}
+}
 void TestBreakIterator::setUp()
 {
 BootstrapFixtureBase::setUp();
diff --git a/i18npool/source/breakiterator/xdictionary.cxx 
b/i18npool/source/breakiterator/xdictionary.cxx
index 1200535..ab2dfd9 100644
--- a/i18npool/source/breakiterator/xdictionary.cxx
+++ b/i18npool/source/breakiterator/xdictionary.cxx
@@ -387,9 +387,11 @@ Boundary xdictionary::getWordBoundary(const OUString& 
rText, sal_Int32 anyPos, s
 if (u_isWhitespace(ch))
 i--;
 }
+
 boundary.endPos = boundary.startPos;
-rText.iterateCodePoints(&boundary.endPos, aCache.wordboundary[i]);
-rText.iterateCodePoints(&boundary.startPos, 
aCache.wordboundary[i-1]);
+boundary.endPos += aCache.wordboundary[i];
+boundary.startPos += aCache.wordboundary[i-1];
+
 } else {
 boundary.startPos = anyPos;
 if (anyPos < len) rText.iterateCodePoints(&anyPos, 1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/inc sc/source

[Kohei Yoshida]

 sc/inc/globalnames.hxx |4 
 sc/source/core/tool/formulagroup.cxx   |3 ++-
 sc/source/ui/optdlg/calcoptionsdlg.cxx |   15 +--
 3 files changed, 15 insertions(+), 7 deletions(-)

New commits:
commit 4b5a98942cd3ebcdacd4d66fb2bd61211fcfe7bc
Author: Kohei Yoshida 
Date:   Wed Jan 8 14:43:39 2014 -0500

fdo#73408: Make the software interpreter selection stick in the UI.

Change-Id: I136a98fadbde82a7a585df9a5691f884c0362699

diff --git a/sc/inc/globalnames.hxx b/sc/inc/globalnames.hxx
index a7f0053..336bee6 100644
--- a/sc/inc/globalnames.hxx
+++ b/sc/inc/globalnames.hxx
@@ -23,6 +23,10 @@
 // set (in nScriptType) if type has not been determined yet
 #define SC_SCRIPTTYPE_UNKNOWN 0x08
 
+// Device name used to represent the software group interpreter for OpenCL
+// mode. This string gets stored in use configuration as the device name.
+#define OPENCL_SOFTWARE_DEVICE_CONFIG_NAME "Software"
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/tool/formulagroup.cxx 
b/sc/source/core/tool/formulagroup.cxx
index 4e13ad3..8ddafd2 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -16,6 +16,7 @@
 #include "compiler.hxx"
 #include "interpre.hxx"
 #include "scmatrix.hxx"
+#include "globalnames.hxx"
 
 #include "formula/vectortoken.hxx"
 #include "rtl/bootstrap.hxx"
@@ -599,7 +600,7 @@ void 
FormulaGroupInterpreter::fillOpenCLInfo(std::vector& rP
 bool FormulaGroupInterpreter::switchOpenCLDevice(const OUString& rDeviceId, 
bool bAutoSelect, bool bForceEvaluation)
 {
 bool bOpenCLEnabled = ScInterpreter::GetGlobalConfig().mbOpenCLEnabled;
-if(!bOpenCLEnabled || rDeviceId == "Software")
+if (!bOpenCLEnabled || rDeviceId == OPENCL_SOFTWARE_DEVICE_CONFIG_NAME)
 {
 if(msInstance)
 {
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx 
b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index 93d8010..c23db00 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -16,6 +16,7 @@
 
 #if HAVE_FEATURE_OPENCL
 #include "formulagroup.hxx"
+#include "globalnames.hxx"
 #endif
 
 namespace {
@@ -200,7 +201,7 @@ void ScCalcOptionsDialog::fillOpenclList()
 {
 mpOpenclInfoList->SetUpdateMode(false);
 mpOpenclInfoList->Clear();
-mpOpenclInfoList->InsertEntry(maSoftware);
+SvTreeListEntry* pSoftwareEntry = 
mpOpenclInfoList->InsertEntry(maSoftware);
 
 OUString aStoredDevice = maConfig.maOpenCLDevice;
 
@@ -225,10 +226,12 @@ void ScCalcOptionsDialog::fillOpenclList()
 
 mpOpenclInfoList->SetUpdateMode(true);
 mpOpenclInfoList->GetModel()->GetView(0)->SelectAll(false, false);
-if(pSelectedEntry)
-{
-mpOpenclInfoList->GetModel()->GetView(0)->Select(pSelectedEntry);
-}
+
+if (pSelectedEntry)
+mpOpenclInfoList->Select(pSelectedEntry);
+else if (aStoredDevice == OPENCL_SOFTWARE_DEVICE_CONFIG_NAME)
+mpOpenclInfoList->Select(pSoftwareEntry);
+
 SelectedDeviceChanged();
 }
 
@@ -404,7 +407,7 @@ void ScCalcOptionsDialog::SelectedDeviceChanged()
 OUString aDevice = 
dynamic_cast(pEntry->GetItem(1))->GetText();
 // use english string for configuration
 if(aDevice == maSoftware)
-aDevice = "Software";
+aDevice = OPENCL_SOFTWARE_DEVICE_CONFIG_NAME;
 
 maConfig.maOpenCLDevice = aDevice;
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: i18npool/qa i18npool/source

[Rohit Deshmukh]

 i18npool/qa/cppunit/test_breakiterator.cxx|   19 ++-
 i18npool/source/breakiterator/xdictionary.cxx |6 --
 2 files changed, 22 insertions(+), 3 deletions(-)

New commits:
commit d8fd15875901d584a4bbcc07c927fa20332e4841
Author: Rohit Deshmukh 
Date:   Fri Dec 6 15:42:53 2013 +0530

fdo#72219: Fix for corruption of symbols in docx

Issue:
OUString uses UTF-16, so for a Unicode surrogate character there are 2
values stored, not just 1.
So we are getting assert failure in "rtl_uString_iterateCodePoints" method.

erAck: Underlying cause was that the dictionary breakiterator misused 
UTF-16 positions as Unicode code point positions.

Change-Id: I923485f56c2d879b63687adaea2b489a3479991c
Reviewed-on: https://gerrit.libreoffice.org/6955
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx 
b/i18npool/qa/cppunit/test_breakiterator.cxx
index 15ce8a1..2c595cf 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -45,7 +45,7 @@ public:
 #endif
 void testKhmer();
 void testJapanese();
-
+void testChinese();
 CPPUNIT_TEST_SUITE(TestBreakIterator);
 CPPUNIT_TEST(testLineBreaking);
 CPPUNIT_TEST(testGraphemeIteration);
@@ -64,6 +64,7 @@ public:
 CPPUNIT_TEST(testLao);
 #endif
 CPPUNIT_TEST(testJapanese);
+CPPUNIT_TEST(testChinese);
 CPPUNIT_TEST_SUITE_END();
 private:
 uno::Reference m_xBreak;
@@ -938,6 +939,22 @@ void TestBreakIterator::testJapanese()
 }
 }
 
+void TestBreakIterator::testChinese()
+{
+lang::Locale aLocale;
+aLocale.Language = "zh";
+aLocale.Country = "CN";
+i18n::Boundary aBounds;
+
+{
+const sal_Unicode CHINESE[] = { 0x6A35, 0x6A30, 0x69FE, 0x8919, 
0xD867, 0xDEDB  };
+
+OUString aTest(CHINESE, SAL_N_ELEMENTS(CHINESE));
+aBounds = m_xBreak->getWordBoundary(aTest, 4, aLocale,
+i18n::WordType::DICTIONARY_WORD, true);
+CPPUNIT_ASSERT(aBounds.startPos == 4 && aBounds.endPos == 6);
+}
+}
 void TestBreakIterator::setUp()
 {
 BootstrapFixtureBase::setUp();
diff --git a/i18npool/source/breakiterator/xdictionary.cxx 
b/i18npool/source/breakiterator/xdictionary.cxx
index 1200535..ab2dfd9 100644
--- a/i18npool/source/breakiterator/xdictionary.cxx
+++ b/i18npool/source/breakiterator/xdictionary.cxx
@@ -387,9 +387,11 @@ Boundary xdictionary::getWordBoundary(const OUString& 
rText, sal_Int32 anyPos, s
 if (u_isWhitespace(ch))
 i--;
 }
+
 boundary.endPos = boundary.startPos;
-rText.iterateCodePoints(&boundary.endPos, aCache.wordboundary[i]);
-rText.iterateCodePoints(&boundary.startPos, 
aCache.wordboundary[i-1]);
+boundary.endPos += aCache.wordboundary[i];
+boundary.startPos += aCache.wordboundary[i-1];
+
 } else {
 boundary.startPos = anyPos;
 if (anyPos < len) rText.iterateCodePoints(&anyPos, 1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sd/uiconfig

[Caolán McNamara]

 sd/uiconfig/simpress/ui/prntopts.ui |   20 ++--
 1 file changed, 18 insertions(+), 2 deletions(-)

New commits:
commit 1657e20e663c0cc65168cd193dd19ff78f478e03
Author: Caolán McNamara 
Date:   Wed Jan 8 18:59:33 2014 +

designate which elements should shrink when limited width

draw/impress print options page (de)

Change-Id: Ie4cf8902d3db68a156d10bd4d1b2c7db33539f9c
(cherry picked from commit 45b72633d1bea5e75a27f5fd93e91071e04c050c)

diff --git a/sd/uiconfig/simpress/ui/prntopts.ui 
b/sd/uiconfig/simpress/ui/prntopts.ui
index faa1123..beeab88 100644
--- a/sd/uiconfig/simpress/ui/prntopts.ui
+++ b/sd/uiconfig/simpress/ui/prntopts.ui
@@ -1,4 +1,5 @@
 
+
 
   
   
@@ -12,11 +13,11 @@
 True
 False
 12
-True
 
   
 True
 False
+True
 0
 none
 
@@ -124,6 +125,7 @@
   
 True
 False
+True
 0
 none
 
@@ -308,11 +310,11 @@
 True
 False
 12
-True
 
   
 True
 False
+True
 0
 none
 
@@ -415,6 +417,7 @@
   
 True
 False
+True
 0
 none
 
@@ -511,4 +514,17 @@
   
 
   
+  
+True
+
+  
+  
+
+  
+  
+
+  
+  
+
+  
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sd/uiconfig/simpress/ui/prntopts.ui |   20 ++--
 1 file changed, 18 insertions(+), 2 deletions(-)

New commits:
commit 45b72633d1bea5e75a27f5fd93e91071e04c050c
Author: Caolán McNamara 
Date:   Wed Jan 8 18:59:33 2014 +

designate which elements should shrink when limited width

draw/impress print options page (de)

Change-Id: Ie4cf8902d3db68a156d10bd4d1b2c7db33539f9c

diff --git a/sd/uiconfig/simpress/ui/prntopts.ui 
b/sd/uiconfig/simpress/ui/prntopts.ui
index faa1123..beeab88 100644
--- a/sd/uiconfig/simpress/ui/prntopts.ui
+++ b/sd/uiconfig/simpress/ui/prntopts.ui
@@ -1,4 +1,5 @@
 
+
 
   
   
@@ -12,11 +13,11 @@
 True
 False
 12
-True
 
   
 True
 False
+True
 0
 none
 
@@ -124,6 +125,7 @@
   
 True
 False
+True
 0
 none
 
@@ -308,11 +310,11 @@
 True
 False
 12
-True
 
   
 True
 False
+True
 0
 none
 
@@ -415,6 +417,7 @@
   
 True
 False
+True
 0
 none
 
@@ -511,4 +514,17 @@
   
 
   
+  
+True
+
+  
+  
+
+  
+  
+
+  
+  
+
+  
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - 2 commits - sc/uiconfig sw/uiconfig

[Caolán McNamara]

 sc/uiconfig/scalc/ui/optcompatibilitypage.ui |9 ++---
 sw/uiconfig/swriter/ui/opttablepage.ui   |   13 +++--
 2 files changed, 17 insertions(+), 5 deletions(-)

New commits:
commit ca070a758cd29315b4e9f91a298c90d2f57936a0
Author: Caolán McNamara 
Date:   Wed Jan 8 18:52:24 2014 +

allow long labels to line break

writer table options page (e.g. de)

Change-Id: Ib8f3daad397fc4b8d37979f5c6d1e12b8884677d
(cherry picked from commit 5b29623e0ad6231dd933bd2b2a0017f89436c9d8)

diff --git a/sw/uiconfig/swriter/ui/opttablepage.ui 
b/sw/uiconfig/swriter/ui/opttablepage.ui
index 48a7f3c..4003ffa 100644
--- a/sw/uiconfig/swriter/ui/opttablepage.ui
+++ b/sw/uiconfig/swriter/ui/opttablepage.ui
@@ -1,4 +1,5 @@
 
+
 
   
   
@@ -337,8 +338,12 @@
   
 True
 False
+True
 0
 Changes 
affect the adjacent area only
+True
+char
+50
   
   
 1
@@ -351,8 +356,11 @@
   
 True
 False
+True
 0
 Changes 
affect the entire table
+True
+50
   
   
 1
@@ -365,8 +373,11 @@
   
 True
 False
+True
 0
 Changes 
affect the table size
+True
+50
   
   
 1
@@ -501,7 +512,6 @@
 True
 start
 ●
-True
 adjustment
 2
   
@@ -518,7 +528,6 @@
 True
 start
 ●
-True
 adjustment
 2
   
commit c8204020835de157aaef60e217275612dab8b633
Author: Caolán McNamara 
Date:   Wed Jan 8 18:43:35 2014 +

stretch label to fill vertically for long text

calc compatibility page (e.g. de)

Change-Id: Ieab742900747808a4c27205b190e416b391b7a39
(cherry picked from commit 3466f403470c192d24b9d7859b8a6a6ae5c94a2b)

diff --git a/sc/uiconfig/scalc/ui/optcompatibilitypage.ui 
b/sc/uiconfig/scalc/ui/optcompatibilitypage.ui
index c71e37a..bc01915 100644
--- a/sc/uiconfig/scalc/ui/optcompatibilitypage.ui
+++ b/sc/uiconfig/scalc/ui/optcompatibilitypage.ui
@@ -1,4 +1,5 @@
 
+
 
   
   
@@ -12,6 +13,7 @@
 True
 False
 True
+True
 0
 none
 
@@ -19,6 +21,7 @@
 True
 False
 True
+True
 6
 12
 
@@ -26,6 +29,7 @@
 True
 False
 True
+True
 6
 12
 
@@ -33,6 +37,7 @@
 True
 False
 True
+True
 0
 0
 Select desired 
_key binding type. Changing the key binding type may overwrite some of the 
existing key bindings.
@@ -52,9 +57,7 @@
   
 True
 False
-center
-0
-1
+start
 
   Default
   OpenOffice.org legacy
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/uiconfig

[Caolán McNamara]

 sw/uiconfig/swriter/ui/opttablepage.ui |   13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 5b29623e0ad6231dd933bd2b2a0017f89436c9d8
Author: Caolán McNamara 
Date:   Wed Jan 8 18:52:24 2014 +

allow long labels to line break

writer table options page (e.g. de)

Change-Id: Ib8f3daad397fc4b8d37979f5c6d1e12b8884677d

diff --git a/sw/uiconfig/swriter/ui/opttablepage.ui 
b/sw/uiconfig/swriter/ui/opttablepage.ui
index 48a7f3c..4003ffa 100644
--- a/sw/uiconfig/swriter/ui/opttablepage.ui
+++ b/sw/uiconfig/swriter/ui/opttablepage.ui
@@ -1,4 +1,5 @@
 
+
 
   
   
@@ -337,8 +338,12 @@
   
 True
 False
+True
 0
 Changes 
affect the adjacent area only
+True
+char
+50
   
   
 1
@@ -351,8 +356,11 @@
   
 True
 False
+True
 0
 Changes 
affect the entire table
+True
+50
   
   
 1
@@ -365,8 +373,11 @@
   
 True
 False
+True
 0
 Changes 
affect the table size
+True
+50
   
   
 1
@@ -501,7 +512,6 @@
 True
 start
 ●
-True
 adjustment
 2
   
@@ -518,7 +528,6 @@
 True
 start
 ●
-True
 adjustment
 2
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configure.ac download.lst external/mdds sc/inc sc/source

[Eike Rathke]

 configure.ac   |2 
 download.lst   |2 
 external/mdds/0001-Workaround-for-an-old-gcc-bug.patch |   27 ---
 external/mdds/UnpackedTarball_mdds.mk  |1 
 sc/inc/scmatrix.hxx|   12 +
 sc/source/core/inc/jumpmatrix.hxx  |   31 
 sc/source/core/tool/interpr1.cxx   |   71 +-
 sc/source/core/tool/jumpmatrix.cxx |  119 -
 sc/source/core/tool/scmatrix.cxx   |   78 +++
 9 files changed, 271 insertions(+), 72 deletions(-)

New commits:
commit e1023ab62a62bb76b73841c02e44eacaba699d0e
Author: Eike Rathke 
Date:   Tue Jan 7 15:47:43 2014 -0500

resolved fdo#72929 buffer jump matrix' result matrix blocks

Update mdds to 0.10.1, set it as the required baseline.

Patch mdds to make available a method to empty multiple elements in one 
call.

This is for multi_type_matrix.

(cherry picked from commit 47a7565315dcfc4271c2b2c205225d914a1a5094)

Update mdds to 0.10.1, set it as the required baseline.

This update will obsolete two patches that were previously applied.

(cherry picked from commit 12890dd7adfc70bc562bb2760084515cc1269a38)

Conflicts:
download.lst

resolved fdo#72929 buffer jump matrix' result matrix blocks

(cherry picked from commit ae4dc8e0ea3b78d804d1022905501a56030073c0)

Change-Id: I7b1fcf6b16b5addbb76078506536542cddede25f
Reviewed-on: https://gerrit.libreoffice.org/7320
Reviewed-by: Kohei Yoshida 
Tested-by: Kohei Yoshida 

diff --git a/configure.ac b/configure.ac
index 637b3d9..41b1cba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8701,7 +8701,7 @@ AC_SUBST(SYSTEM_BOOST)
 dnl ===
 dnl Check for system mdds
 dnl ===
-libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds >= 0.9.1])
+libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds >= 0.10.1])
 
 dnl ===
 dnl Determine which hash container mdds shall use
diff --git a/download.lst b/download.lst
index aaa4da6..1cf4224 100644
--- a/download.lst
+++ b/download.lst
@@ -80,7 +80,7 @@ export LIBXML_TARBALL := 
9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz
 export LIBXSLT_TARBALL := 
9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 export MARIADB_TARBALL := 
05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2
-export MDDS_TARBALL := 8c853024fbcff39113d9285250dafc66-mdds_0.9.1.tar.bz2
+export MDDS_TARBALL := 01a380acfec23bf617117ce98e318f3d-mdds_0.10.1.tar.bz2
 export MYSQLCPPCONN_TARBALL := 
0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
 export MYTHES_TARBALL := 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz
 export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
diff --git a/external/mdds/0001-Workaround-for-an-old-gcc-bug.patch 
b/external/mdds/0001-Workaround-for-an-old-gcc-bug.patch
deleted file mode 100644
index 8529fbf..000
--- a/external/mdds/0001-Workaround-for-an-old-gcc-bug.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 3e3a5c483217fe05b5bd556bf1b2c6f3ec297cb1 Mon Sep 17 00:00:00 2001
-From: Kohei Yoshida 
-Date: Sat, 22 Jun 2013 21:30:13 -0400
-Subject: [PATCH] Workaround for an old gcc bug.
-
-c.f. http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44963

- include/mdds/multi_type_vector_types.hpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/include/mdds/multi_type_vector_types.hpp 
b/include/mdds/multi_type_vector_types.hpp
-index c4b2772..44af655 100644
 a/include/mdds/multi_type_vector_types.hpp
-+++ b/c/d/include/mdds/multi_type_vector_types.hpp
-@@ -278,7 +278,8 @@ public:
- #ifndef MDDS_MULTI_TYPE_VECTOR_USE_DEQUE
- d.reserve(d.size() + len);
- #endif
--std::copy(its.first, its.second, std::back_inserter(d));
-+for (; its.first != its.second; ++its.first)
-+d.push_back(*its.first);
- }
- 
- static void assign_values_from_block(
--- 
-1.8.1.4
-
diff --git a/external/mdds/UnpackedTarball_mdds.mk 
b/external/mdds/UnpackedTarball_mdds.mk
index 1ccfc2a..387b8bc 100644
--- a/external/mdds/UnpackedTarball_mdds.mk
+++ b/external/mdds/UnpackedTarball_mdds.mk
@@ -15,7 +15,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,3))
 
 $(eval $(call gb_UnpackedTarball_add_patches,mdds,\
external/mdds/mdds_0.6.0.patch \
-   external/mdds/0001-Workaround-for-an-old-gcc-bug.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx
index 93105dd..1db1641 100644
--- a/sc/inc/scmatrix.hxx
+++ b/sc/inc/scmatrix.hxx
@@ -269,6 +269,18 @@ publ

[Libreoffice-commits] core.git: sc/uiconfig

[Caolán McNamara]

 sc/uiconfig/scalc/ui/optcompatibilitypage.ui |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 3466f403470c192d24b9d7859b8a6a6ae5c94a2b
Author: Caolán McNamara 
Date:   Wed Jan 8 18:43:35 2014 +

stretch label to fill vertically for long text

calc compatibility page (e.g. de)

Change-Id: Ieab742900747808a4c27205b190e416b391b7a39

diff --git a/sc/uiconfig/scalc/ui/optcompatibilitypage.ui 
b/sc/uiconfig/scalc/ui/optcompatibilitypage.ui
index c71e37a..bc01915 100644
--- a/sc/uiconfig/scalc/ui/optcompatibilitypage.ui
+++ b/sc/uiconfig/scalc/ui/optcompatibilitypage.ui
@@ -1,4 +1,5 @@
 
+
 
   
   
@@ -12,6 +13,7 @@
 True
 False
 True
+True
 0
 none
 
@@ -19,6 +21,7 @@
 True
 False
 True
+True
 6
 12
 
@@ -26,6 +29,7 @@
 True
 False
 True
+True
 6
 12
 
@@ -33,6 +37,7 @@
 True
 False
 True
+True
 0
 0
 Select desired 
_key binding type. Changing the key binding type may overwrite some of the 
existing key bindings.
@@ -52,9 +57,7 @@
   
 True
 False
-center
-0
-1
+start
 
   Default
   OpenOffice.org legacy
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - cui/uiconfig

[Caolán McNamara]

 cui/uiconfig/ui/opthtmlpage.ui |   19 ++-
 1 file changed, 6 insertions(+), 13 deletions(-)

New commits:
commit 9a8a7212508151971dde9811e71c1cb775585ac3
Author: Caolán McNamara 
Date:   Wed Jan 8 18:34:06 2014 +

designate which elements should shrink when limited width

load/save HTML compatibility page (e.g. .de|pl)

Change-Id: I1d118ebcf8718244dd4f2bab2dc6cb8d60b1008b
(cherry picked from commit 3b0648f2b74b5ac95deabcc3dce2ff690a1f6cc6)

diff --git a/cui/uiconfig/ui/opthtmlpage.ui b/cui/uiconfig/ui/opthtmlpage.ui
index ea6fb99..56cc127 100644
--- a/cui/uiconfig/ui/opthtmlpage.ui
+++ b/cui/uiconfig/ui/opthtmlpage.ui
@@ -1,4 +1,5 @@
 
+
 
   
   
@@ -60,14 +61,12 @@
   
 True
 False
-True
 vertical
 12
 
   
 True
 False
-True
 True
 0
 none
@@ -75,7 +74,6 @@
   
 True
 False
-True
 True
 6
 12
@@ -83,7 +81,6 @@
   
 True
 False
-True
 6
 12
 
@@ -106,7 +103,6 @@
 True
 True
 ●
-True
 adjustsize7
   
   
@@ -136,7 +132,6 @@
 True
 True
 ●
-True
 adjustsize6
   
   
@@ -166,7 +161,6 @@
 True
 True
 ●
-True
 adjustsize5
   
   
@@ -196,7 +190,6 @@
 True
 True
 ●
-True
 adjustsize4
   
   
@@ -226,7 +219,6 @@
 True
 True
 ●
-True
 adjustsize3
   
   
@@ -256,7 +248,6 @@
 True
 True
 ●
-True
 adjustsize2
   
   
@@ -286,7 +277,6 @@
 True
 True
 ●
-True
 adjustsize1
   
   
@@ -431,6 +421,7 @@
   
 True
 False
+True
 True
 0
 none
@@ -438,6 +429,7 @@
   
 True
 False
+True
 True
 6
 12
@@ -445,6 +437,7 @@
   
 True
 False
+True
 6
 
   
@@ -473,6 +466,8 @@
   
 True
 False
+start
+True
   
   
 1
@@ -567,8 +562,6 @@
 True
 False
 start
-0
-1
 
   Microsoft Internet Explorer
   Mozilla Firefox
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 cui/uiconfig/ui/opthtmlpage.ui |   19 ++-
 1 file changed, 6 insertions(+), 13 deletions(-)

New commits:
commit 3b0648f2b74b5ac95deabcc3dce2ff690a1f6cc6
Author: Caolán McNamara 
Date:   Wed Jan 8 18:34:06 2014 +

designate which elements should shrink when limited width

load/save HTML compatibility page (e.g. .de|pl)

Change-Id: I1d118ebcf8718244dd4f2bab2dc6cb8d60b1008b

diff --git a/cui/uiconfig/ui/opthtmlpage.ui b/cui/uiconfig/ui/opthtmlpage.ui
index ea6fb99..56cc127 100644
--- a/cui/uiconfig/ui/opthtmlpage.ui
+++ b/cui/uiconfig/ui/opthtmlpage.ui
@@ -1,4 +1,5 @@
 
+
 
   
   
@@ -60,14 +61,12 @@
   
 True
 False
-True
 vertical
 12
 
   
 True
 False
-True
 True
 0
 none
@@ -75,7 +74,6 @@
   
 True
 False
-True
 True
 6
 12
@@ -83,7 +81,6 @@
   
 True
 False
-True
 6
 12
 
@@ -106,7 +103,6 @@
 True
 True
 ●
-True
 adjustsize7
   
   
@@ -136,7 +132,6 @@
 True
 True
 ●
-True
 adjustsize6
   
   
@@ -166,7 +161,6 @@
 True
 True
 ●
-True
 adjustsize5
   
   
@@ -196,7 +190,6 @@
 True
 True
 ●
-True
 adjustsize4
   
   
@@ -226,7 +219,6 @@
 True
 True
 ●
-True
 adjustsize3
   
   
@@ -256,7 +248,6 @@
 True
 True
 ●
-True
 adjustsize2
   
   
@@ -286,7 +277,6 @@
 True
 True
 ●
-True
 adjustsize1
   
   
@@ -431,6 +421,7 @@
   
 True
 False
+True
 True
 0
 none
@@ -438,6 +429,7 @@
   
 True
 False
+True
 True
 6
 12
@@ -445,6 +437,7 @@
   
 True
 False
+True
 6
 
   
@@ -473,6 +466,8 @@
   
 True
 False
+start
+True
   
   
 1
@@ -567,8 +562,6 @@
 True
 False
 start
-0
-1
 
   Microsoft Internet Explorer
   Mozilla Firefox
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 4 commits - avmedia/source nss/makefile.mk postprocess/packcomponents scp2/source solenv/bin solenv/doc solenv/gbuild solenv/inc vcl/Library_vcl.mk

[Herbert Dürr]

 avmedia/source/quicktime/makefile.mk |6 --
 nss/makefile.mk  |   26 ++
 postprocess/packcomponents/makefile.mk   |4 +++-
 scp2/source/ooo/file_library_ooo.scp |6 +++---
 scp2/source/ooo/makefile.mk  |3 +++
 solenv/bin/srcrelease.xml|2 +-
 solenv/doc/gbuild/solenv/gbuild/types.mk |2 ++
 solenv/gbuild/LinkTarget.mk  |4 
 solenv/inc/unxmaccx.mk   |1 +
 vcl/Library_vcl.mk   |7 ---
 vcl/util/makefile.mk |8 ++--
 11 files changed, 33 insertions(+), 36 deletions(-)

New commits:
commit 90302f3cdff7ac895fbc64209aaa57a9e743b6b7
Author: Herbert Dürr 
Date:   Wed Jan 8 17:51:35 2014 +

#i122301# use the BUILD64 flag to simplify the NSS makefile

diff --git a/nss/makefile.mk b/nss/makefile.mk
index b9e482f..ce00499 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -56,31 +56,11 @@ BUILD_OPT=1
 .EXPORT: BUILD_OPT
 .ENDIF
 
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)$(COM)"=="LINUXGCC"
 .IF "$(BUILD64)"=="1"
-# force 64-bit buildmode
+# force the 64-bit build mode for 64bit targets
 USE_64:=1
 .EXPORT : USE_64
-.ENDIF # "$(CPU)"=="X"
-.ENDIF  # "$(OS)$(COM)"=="LINUXGCC"
-
-.IF "$(OS)$(COM)"=="FREEBSDGCC"
-.IF "$(CPU)"=="X"
-# force 64-bit buildmode
-USE_64:=1
-.EXPORT : USE_64
-.ENDIF # "$(CPU)"=="X"
-.ENDIF  # "$(OS)$(COM)"=="LINUXGCC"
-
-.IF "$(OS)"=="MACOSX"
-.IF "$(EXTRA_CFLAGS)"!=""
-CPP:=gcc -E $(EXTRA_CFLAGS)
-CXX:=g++ $(EXTRA_CFLAGS)
-CC:=gcc $(EXTRA_CFLAGS)
-.EXPORT : CPP
-.ENDIF # "$(EXTRA_CFLAGS)"!=""
-.ENDIF # "$(OS)"=="MACOSX"
+.ENDIF # "$(BUILD64)"=="1"
 
 OUT2LIB=mozilla$/dist$/out$/lib$/*$(DLLPOST)
 
@@ -92,8 +72,6 @@ BUILD_ACTION+=FREEBL_NO_DEPEND=1 FREEBL_LOWHASH=1
 PATCH_FILES+=nss_linux.patch
 .ENDIF
 
-.ENDIF # "$(GUI)"=="UNX"
-
 
 .IF "$(GUI)"=="WNT"
 
commit 17b4e3f22addf30cd6758a571cd1351d454c3ada
Author: Herbert Dürr 
Date:   Wed Jan 8 17:45:05 2014 +

#i122301# set the BUILD64 flag for the 64bit Mac build

diff --git a/solenv/inc/unxmaccx.mk b/solenv/inc/unxmaccx.mk
index 575c720..b9b3afd 100644
--- a/solenv/inc/unxmaccx.mk
+++ b/solenv/inc/unxmaccx.mk
@@ -22,6 +22,7 @@
 # Mac OSX specific defines
 
 PROCESSOR_DEFINES=-DX86_64
+BUILD64=1
 
 DLLPOSTFIX=
 
commit b3280a1c8624530cbe119ddf81c23de302c1a10a
Author: Herbert Dürr 
Date:   Wed Jan 8 17:03:23 2014 +

#i114728# the quicktime framework is is no longer available in OSX 
SDKs>=10.7

diff --git a/avmedia/source/quicktime/makefile.mk 
b/avmedia/source/quicktime/makefile.mk
index 9a56849..7d386b1 100644
--- a/avmedia/source/quicktime/makefile.mk
+++ b/avmedia/source/quicktime/makefile.mk
@@ -25,7 +25,8 @@ PRJ=..$/..
 PRJNAME=avmedia
 TARGET=avmediaQuickTime
 
-.IF "$(GUIBASE)"=="aqua"
+# the QuickTime API has been removed in OSX SDK 10.7
+.IF "$(GUIBASE)"=="aqua" && "${MACOSX_DEPLOYMENT_TARGET:s/.//}"<"107"
 
 # --- Settings --
 
@@ -43,10 +44,10 @@ SLOFILES= \
 $(SLO)$/quicktimeuno.obj  \
 $(SLO)$/manager.obj   \
 $(SLO)$/window.obj\
-$(SLO)$/framegrabber.obj\
 $(SLO)$/player.obj
 
 EXCEPTIONSFILES= \
+$(SLO)$/framegrabber.obj\
 $(SLO)$/quicktimeuno.obj
 
 SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
@@ -87,3 +88,4 @@ $(MISC)/avmediaQuickTime.component .ERRREMOVE : \
 $(XSLTPROC) --nonet --stringparam uri \
 '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
 $(SOLARENV)/bin/createcomponent.xslt avmediaQuickTime.component
+
diff --git a/postprocess/packcomponents/makefile.mk 
b/postprocess/packcomponents/makefile.mk
index 52c7800..090a83b 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -310,11 +310,13 @@ my_components += \
 
 .IF "$(OS)" == "MACOSX"
 my_components += \
-avmediaQuickTime \
 fps_aqua \
 macab1 \
 macbe1 \
 MacOSXSpell
+.IF "${MACOSX_DEPLOYMENT_TARGET:s/.//}"<"107"
+my_components += avmediaQuickTime
+.END
 .END
 
 .IF "$(OS)" == "WNT"
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index cd94075..cc3d874 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -586,7 +586,6 @@ End
 #endif
 
 #ifdef MACOSX
-#ifdef QUARTZ
 File gid_File_Lib_Fps_Aqua
 TXT_FILE_BODY;
 Styles = (PACKED);
@@ -601,14 +600,15 @@ File gid_File_Lib_MacOSXSpell
Dir = SCP2_OOO_BIN_DIR;
 End
 
+#if MACOSX_DEPLOYMENT_TARGET<107
 File gid_File_Lib_avmediaQuickTime
TXT_FILE_BODY;
Styles = (PACKED);
Name = LIBNAME(avmediaQuickTime);
Dir = SCP2_OOO_BIN_DIR;
 End
-#endif
-#endif
+#endif // MACOSX_DEPLOYMENT_TARGET
+#endif // MACOSX
 
 #ifdef OS2
 SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fps_Office, fps_offi )
diff --git a/scp2/sou

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

[Miklos Vajna]

 sw/source/core/doc/docbm.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a39cc5745d28e9c1fc65873d1792cb545b316924
Author: Miklos Vajna 
Date:   Wed Jan 8 18:36:11 2014 +0100

sw: one more bind -> boost::bind

Change-Id: I6f3d36f0b0775559f3f0617d273a4f4595feda76

diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index e1d6157..194680f 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -843,7 +843,7 @@ namespace sw { namespace mark
 find_if(
 pMarkLow,
 pMarkHigh,
-boost::bind(equal_to(), 
bind(&boost::shared_ptr::get, _1), pMark) );
+boost::bind(equal_to(), 
boost::bind(&boost::shared_ptr::get, _1), pMark) );
 if(pMarkFound != pMarkHigh)
 deleteMark(pMarkFound);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/quartz

[Tor Lillqvist]

 vcl/quartz/salgdicommon.cxx |8 
 1 file changed, 8 deletions(-)

New commits:
commit 57248316be882c65eb6431cbba2ad4f971d86c95
Author: Tor Lillqvist 
Date:   Wed Jan 8 15:14:32 2014 +0200

Fix compilation error for 64-bit OS X by simplifying code

The ifdef for __LP64__ is not needed as far as I can see.

Fixes error: cannot initialize a parameter of type 'const sal_GlyphId
*' (aka 'const unsigned int *') with an lvalue of type 'long *'.

Change-Id: I89d3ba29a5cfd1a89141ec86c873eaf384cf446e

diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index 26d4d3d..cc45334 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -173,16 +173,8 @@ sal_Bool AquaSalGraphics::CreateFontSubset( const 
OUString& rToFile,
 
 // make the subsetter provide the requested subset
 FILE* pOutFile = fopen( aToFile.getStr(), "wb" );
-#ifdef __LP64__
-long *pLongGlyphIDs = (long*)alloca(nGlyphCount * sizeof(long));
-for (int i = 0; i < nGlyphCount; i++)
-pLongGlyphIDs[i] = pGlyphIds[i];
-bool bRC = rInfo.CreateFontSubset( FontSubsetInfo::TYPE1_PFB, 
pOutFile, NULL,
-pLongGlyphIDs, pEncoding, nGlyphCount, pGlyphWidths );
-#else
 bool bRC = rInfo.CreateFontSubset( FontSubsetInfo::TYPE1_PFB, 
pOutFile, NULL,
 pGlyphIds, pEncoding, nGlyphCount, pGlyphWidths );
-#endif
 fclose( pOutFile );
 return bRC;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-0' - .gitreview

[Eike Rathke]

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

New commits:
commit 131ba7f976b4d2adbb1fa07b0a49e4e467d11b02
Author: Eike Rathke 
Date:   Wed Jan 8 18:29:20 2014 +0100

defaultbranch=libreoffice-4-2-0

Change-Id: I85ad2a2906cf758c953acd3dbd7ca323e8bf791d

diff --git a/.gitreview b/.gitreview
index 710fd1e..bbf2306 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,5 +3,5 @@ host=logerrit
 port=29418
 project=core
 defaultremote=logerrit
-defaultbranch=libreoffice-4-2
+defaultbranch=libreoffice-4-2-0
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

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

Bug 60270 depends on bug 67011, which changed state.

Bug 67011 Summary: EDITING: Libreoffice calc hangs when drag&dropping cell(s) 
in KDE4
https://bugs.freedesktop.org/show_bug.cgi?id=67011

   What|Removed |Added

 Status|UNCONFIRMED |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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/uiconfig

[Caolán McNamara]

 sc/uiconfig/scalc/ui/scgeneralpage.ui |   44 ++
 1 file changed, 9 insertions(+), 35 deletions(-)

New commits:
commit 9a7bbabc4fd95089068217d38cd0281da65de756
Author: Caolán McNamara 
Date:   Wed Jan 8 17:19:17 2014 +

designate which elements should shrink when limited width

Calc general page (e.g. .de)

Change-Id: Ifc5c230040c9b59f8570a64deda0121ac93ed0e9
(cherry picked from commit 7fb178343eb121ff5e262a16aa601f7be23edc69)

diff --git a/sc/uiconfig/scalc/ui/scgeneralpage.ui 
b/sc/uiconfig/scalc/ui/scgeneralpage.ui
index 675d6d9..d35a99a 100644
--- a/sc/uiconfig/scalc/ui/scgeneralpage.ui
+++ b/sc/uiconfig/scalc/ui/scgeneralpage.ui
@@ -1,4 +1,5 @@
 
+
 
   
   
@@ -76,7 +77,6 @@
 True
 True
 •
-True
 adjustment1
 2
   
@@ -91,9 +91,6 @@
   
 True
 False
-7
-0
-1
   
   
 1
@@ -288,7 +285,7 @@
   
 0
 1
-1
+2
 1
   
 
@@ -305,7 +302,7 @@
   
 0
 2
-1
+2
 1
   
 
@@ -322,7 +319,7 @@
   
 0
 3
-1
+2
 1
   
 
@@ -339,7 +336,7 @@
   
 0
 4
-1
+2
 1
   
 
@@ -355,7 +352,7 @@
   
 0
 5
-1
+2
 1
   
 
@@ -372,7 +369,7 @@
   
 0
 6
-1
+2
 1
   
 
@@ -380,10 +377,8 @@
   
 True
 False
+end
 True
-7
-0
-1
 
   Down
   Right
@@ -428,31 +423,10 @@
   
 0
 7
-1
+2
 1
   
 
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

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

Bug 60270 depends on bug 67011, which changed state.

Bug 67011 Summary: EDITING: Libreoffice calc hangs when drag&dropping cell(s) 
in KDE4
https://bugs.freedesktop.org/show_bug.cgi?id=67011

   What|Removed |Added

 Status|RESOLVED|UNCONFIRMED
 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

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

[Miklos Vajna]

 sw/source/core/doc/docbm.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 454b30202498914c133831a20c30f30249eb6c03
Author: Miklos Vajna 
Date:   Wed Jan 8 18:21:32 2014 +0100

sw: try to fix Windows build

Change-Id: If6423d2ee942e0e0a27c61c69b995fedee5f5f7e

diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index d6e6457..e1d6157 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -837,13 +837,13 @@ namespace sw { namespace mark
 m_vAllMarks.begin(),
 m_vAllMarks.end(),
 pMark->GetMarkStart(),
-bind(&IMark::StartsBefore, _1, _2) );
+sw::mark::CompareIMarkStartsBefore());
 iterator_t pMarkHigh = m_vAllMarks.end();
 iterator_t pMarkFound =
 find_if(
 pMarkLow,
 pMarkHigh,
-bind(equal_to(), 
bind(&boost::shared_ptr::get, _1), pMark) );
+boost::bind(equal_to(), 
bind(&boost::shared_ptr::get, _1), pMark) );
 if(pMarkFound != pMarkHigh)
 deleteMark(pMarkFound);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/uiconfig

[Caolán McNamara]

 sc/uiconfig/scalc/ui/scgeneralpage.ui |   44 ++
 1 file changed, 9 insertions(+), 35 deletions(-)

New commits:
commit 7fb178343eb121ff5e262a16aa601f7be23edc69
Author: Caolán McNamara 
Date:   Wed Jan 8 17:19:17 2014 +

designate which elements should shrink when limited width

Calc general page (e.g. .de)

Change-Id: Ifc5c230040c9b59f8570a64deda0121ac93ed0e9

diff --git a/sc/uiconfig/scalc/ui/scgeneralpage.ui 
b/sc/uiconfig/scalc/ui/scgeneralpage.ui
index 675d6d9..d35a99a 100644
--- a/sc/uiconfig/scalc/ui/scgeneralpage.ui
+++ b/sc/uiconfig/scalc/ui/scgeneralpage.ui
@@ -1,4 +1,5 @@
 
+
 
   
   
@@ -76,7 +77,6 @@
 True
 True
 •
-True
 adjustment1
 2
   
@@ -91,9 +91,6 @@
   
 True
 False
-7
-0
-1
   
   
 1
@@ -288,7 +285,7 @@
   
 0
 1
-1
+2
 1
   
 
@@ -305,7 +302,7 @@
   
 0
 2
-1
+2
 1
   
 
@@ -322,7 +319,7 @@
   
 0
 3
-1
+2
 1
   
 
@@ -339,7 +336,7 @@
   
 0
 4
-1
+2
 1
   
 
@@ -355,7 +352,7 @@
   
 0
 5
-1
+2
 1
   
 
@@ -372,7 +369,7 @@
   
 0
 6
-1
+2
 1
   
 
@@ -380,10 +377,8 @@
   
 True
 False
+end
 True
-7
-0
-1
 
   Down
   Right
@@ -428,31 +423,10 @@
   
 0
 7
-1
+2
 1
   
 
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/source/core/docnode/nodedump.cxx |   18 ++
 1 file changed, 18 insertions(+)

New commits:
commit 63c8904a7c6167f7eaaca534f0b8da3d3bb1ff31
Author: Miklos Vajna 
Date:   Wed Jan 8 16:03:16 2014 +0100

sw document model xml dump: include annotation marks

Change-Id: Iea687761a137650965ed48340063d20b6489b531

diff --git a/sw/source/core/docnode/nodedump.cxx 
b/sw/source/core/docnode/nodedump.cxx
index f83f2de..0ef2674 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -142,6 +142,21 @@ void MarkManager::dumpAsXml( xmlTextWriterPtr w )
 writer.endElement();
 }
 writer.endElement();
+
+writer.startElement("annotationmarks");
+for (const_iterator_t it = m_vAnnotationMarks.begin(); it != 
m_vAnnotationMarks.end(); ++it)
+{
+pMark_t pMark = *it;
+writer.startElement("annotationmark");
+writer.writeFormatAttribute("startNode", TMP_FORMAT, 
pMark->GetMarkStart().nNode.GetIndex());
+writer.writeFormatAttribute("startOffset", TMP_FORMAT_I32, 
pMark->GetMarkStart().nContent.GetIndex());
+writer.writeFormatAttribute("endNode", TMP_FORMAT, 
pMark->GetMarkEnd().nNode.GetIndex());
+writer.writeFormatAttribute("endOffset", TMP_FORMAT_I32, 
pMark->GetMarkEnd().nContent.GetIndex());
+OString txt8 = OUStringToOString(pMark->GetName(), 
RTL_TEXTENCODING_UTF8);
+writer.writeFormatAttribute("name", "%s", BAD_CAST( txt8.getStr()));
+writer.endElement();
+}
+writer.endElement();
 writer.endElement();
 }
 } // namespace mark
@@ -422,6 +437,9 @@ void SwTxtNode::dumpAsXml( xmlTextWriterPtr w )
 case RES_TXTATR_AUTOFMT:
 pWhich = "autofmt";
 break;
+case RES_TXTATR_ANNOTATION:
+pWhich = "annotation";
+break;
 default:
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/uiconfig

[Caolán McNamara]

 sc/uiconfig/scalc/ui/optformula.ui |   27 +--
 1 file changed, 13 insertions(+), 14 deletions(-)

New commits:
commit 6cdf269a93685d5dfd7811faabb55acd2d7b2561
Author: Caolán McNamara 
Date:   Wed Jan 8 17:05:19 2014 +

designate which elements should shrink when limited width

Change-Id: I46c5290ab411ac133ef8ea1e461197b00d837068

diff --git a/sc/uiconfig/scalc/ui/optformula.ui 
b/sc/uiconfig/scalc/ui/optformula.ui
index b77d2da..dfefcc0 100644
--- a/sc/uiconfig/scalc/ui/optformula.ui
+++ b/sc/uiconfig/scalc/ui/optformula.ui
@@ -1,13 +1,7 @@
 
+
 
   
-  
-1
-32000
-1
-1
-10
-  
   
 True
 False
@@ -293,8 +287,8 @@
 True
 True
 center
+True
 ●
-True
   
   
 1
@@ -308,8 +302,8 @@
 True
 True
 center
+True
 ●
-True
   
   
 1
@@ -323,8 +317,8 @@
 True
 True
 center
+True
 ●
-True
   
   
 1
@@ -437,8 +431,7 @@
   
 True
 False
-0
-1
+True
 
   Always recalculate
   Never recalculate
@@ -456,8 +449,7 @@
   
 True
 False
-0
-1
+True
 
   Always recalculate
   Never recalculate
@@ -500,4 +492,11 @@
   
 
   
+  
+1
+32000
+1
+1
+10
+  
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/uiconfig

[Caolán McNamara]

 sc/uiconfig/scalc/ui/optformula.ui |   27 +--
 1 file changed, 13 insertions(+), 14 deletions(-)

New commits:
commit 2f6f9236eb6d64f1adaef275df100dde898a8dd5
Author: Caolán McNamara 
Date:   Wed Jan 8 17:05:19 2014 +

designate which elements should shrink when limited width

Change-Id: I46c5290ab411ac133ef8ea1e461197b00d837068
(cherry picked from commit 6cdf269a93685d5dfd7811faabb55acd2d7b2561)

diff --git a/sc/uiconfig/scalc/ui/optformula.ui 
b/sc/uiconfig/scalc/ui/optformula.ui
index b77d2da..dfefcc0 100644
--- a/sc/uiconfig/scalc/ui/optformula.ui
+++ b/sc/uiconfig/scalc/ui/optformula.ui
@@ -1,13 +1,7 @@
 
+
 
   
-  
-1
-32000
-1
-1
-10
-  
   
 True
 False
@@ -293,8 +287,8 @@
 True
 True
 center
+True
 ●
-True
   
   
 1
@@ -308,8 +302,8 @@
 True
 True
 center
+True
 ●
-True
   
   
 1
@@ -323,8 +317,8 @@
 True
 True
 center
+True
 ●
-True
   
   
 1
@@ -437,8 +431,7 @@
   
 True
 False
-0
-1
+True
 
   Always recalculate
   Never recalculate
@@ -456,8 +449,7 @@
   
 True
 False
-0
-1
+True
 
   Always recalculate
   Never recalculate
@@ -500,4 +492,11 @@
   
 
   
+  
+1
+32000
+1
+1
+10
+  
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Advice needed : making options dialog slightly wider

[Caolán McNamara]

On Sat, 2014-01-04 at 13:05 +0100, Jean-Baptiste Faure wrote:
> Hi Caolan, all,
> 
> Is there a disadvantage to make the options dialog slightly wider ?
> Doing that will allow French localized strings (and probably the German
> ones) to find enough room. For example in Tools > Options > LibreOffice
> Calc > View

Well, probably not a problem to make it wider. But I'd prefer to first
know first what font and size is your desktop's interface font ? so I
can have a look at the problem because (needless to say) it works fine
here with those translations and the .uis can be tweaked to specific
what elements are to shrink when there isn't enough space.

The options dialog is a special case because it has so many tabs (and
its impossible to convert all the tabs in one go anyway) that it has a
fixed size, while all the other ones have a flexible size.

C.

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

[Libreoffice-commits] core.git: sc/inc sc/source

[Eike Rathke]

 sc/inc/scmatrix.hxx|   12 +++
 sc/source/core/inc/jumpmatrix.hxx  |   31 +
 sc/source/core/tool/interpr1.cxx   |   71 ++
 sc/source/core/tool/jumpmatrix.cxx |  119 +++--
 sc/source/core/tool/scmatrix.cxx   |   78 
 5 files changed, 269 insertions(+), 42 deletions(-)

New commits:
commit ae4dc8e0ea3b78d804d1022905501a56030073c0
Author: Eike Rathke 
Date:   Wed Jan 8 01:56:46 2014 +0100

resolved fdo#72929 buffer jump matrix' result matrix blocks

diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx
index 93105dd..1db1641 100644
--- a/sc/inc/scmatrix.hxx
+++ b/sc/inc/scmatrix.hxx
@@ -269,6 +269,18 @@ public:
 void FillDouble( double fVal,
 SCSIZE nC1, SCSIZE nR1, SCSIZE nC2, SCSIZE nR2 );
 
+/** Put a column vector of doubles, starting at row nR, must fit into 
dimensions. */
+void PutDoubleVector( const ::std::vector< double > & rVec, SCSIZE nC, 
SCSIZE nR );
+
+/** Put a column vector of strings, starting at row nR, must fit into 
dimensions. */
+void PutStringVector( const ::std::vector< svl::SharedString > & rVec, 
SCSIZE nC, SCSIZE nR );
+
+/** Put a column vector of empties, starting at row nR, must fit into 
dimensions. */
+void PutEmptyVector( SCSIZE nCount, SCSIZE nC, SCSIZE nR );
+
+/** Put a column vector of empty paths, starting at row nR, must fit into 
dimensions. */
+void PutEmptyPathVector( SCSIZE nCount, SCSIZE nC, SCSIZE nR );
+
 /** May be used before obtaining the double value of an element to avoid
 passing its NAN around.
 @ATTENTION: MUST NOT be used if the element is a string!
diff --git a/sc/source/core/inc/jumpmatrix.hxx 
b/sc/source/core/inc/jumpmatrix.hxx
index 30391f9..959a865 100644
--- a/sc/source/core/inc/jumpmatrix.hxx
+++ b/sc/source/core/inc/jumpmatrix.hxx
@@ -67,6 +67,29 @@ class ScJumpMatrix
 SCSIZE  nResMatRows;
 boolbStarted;
 
+// Buffer result ranges to be able to set a range of identically typed
+// values at the result matrix in order to avoid multiple shrinks and
+// growths of multi_type_vector segments, which is a major performance
+// bottleneck, see fdo#72929
+::std::vector< svl::SharedString >  mvBufferStrings;
+::std::vector< double > mvBufferDoubles;
+SCSIZE  mnBufferCol;
+SCSIZE  mnBufferRowStart;
+SCSIZE  mnBufferEmptyCount;
+SCSIZE  mnBufferEmptyPathCount;
+
+enum BufferType
+{
+BUFFER_NONE,
+BUFFER_DOUBLE,
+BUFFER_STRING,
+BUFFER_EMPTY,
+BUFFER_EMPTYPATH
+};
+
+/** Flush different types or non-consecutive buffers. */
+void FlushBufferOtherThan( BufferType eType, SCSIZE nC, SCSIZE nR );
+
 // not implemented, prevent usage
 ScJumpMatrix( const ScJumpMatrix& );
 ScJumpMatrix& operator=( const ScJumpMatrix& );
@@ -80,11 +103,17 @@ public:
 void SetAllJumps( double fBool, short nStart, short nNext, short nStop = 
SHRT_MAX );
 void SetJumpParameters( ScTokenVec* p );
 const ScTokenVec* GetJumpParameters() const;
-ScMatrix* GetResultMatrix() const;
+bool HasResultMatrix() const;
+ScMatrix* GetResultMatrix();///< also applies pending buffered 
values
 void GetPos( SCSIZE& rCol, SCSIZE& rRow ) const;
 bool Next( SCSIZE& rCol, SCSIZE& rRow );
 void GetResMatDimensions( SCSIZE& rCols, SCSIZE& rRows );
 void SetNewResMat( SCSIZE nNewCols, SCSIZE nNewRows );
+
+void PutResultDouble( double fVal, SCSIZE nC, SCSIZE nR );
+void PutResultString( const svl::SharedString& rStr, SCSIZE nC, SCSIZE nR 
);
+void PutResultEmpty( SCSIZE nC, SCSIZE nR );
+void PutResultEmptyPath( SCSIZE nC, SCSIZE nR );
 };
 
 #endif // SC_JUMPMATRIX_HXX
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index bf32280..d9d1867 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -216,20 +216,20 @@ void ScInterpreter::ScIfJump()
 is the result matrix of a jump matrix. All arguments must be valid and are
 not checked. */
 static void lcl_storeJumpMatResult(
-const ScMatrix* pMat, ScMatrix* pResMat, SCSIZE nC, SCSIZE nR )
+const ScMatrix* pMat, ScJumpMatrix* pJumpMat, SCSIZE nC, SCSIZE nR )
 {
 if ( pMat->IsValue( nC, nR ) )
 {
 double fVal = pMat->GetDouble( nC, nR );
-pResMat->PutDouble( fVal, nC, nR );
+pJumpMat->PutResultDouble( fVal, nC, nR );
 }
 else if ( pMat->IsEmpty( nC, nR ) )
 {
-pResMat->PutEmpty( nC, nR );
+pJumpMat->PutResultEmpty( nC, nR );
 }
 else
 {
-pResMat->PutString(pMat->GetString(nC, nR), nC, nR);
+pJumpMat->PutResultString(pMat->GetString(nC, nR), nC, nR);
 }
 }
 
@@ -334,7 +334,6 @@ void ScInterpreter:

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - include/oox oox/source sc/source

[Noel Power]

 include/oox/ole/vbaproject.hxx|   11 +++-
 oox/source/ole/axcontrol.cxx  |   10 +--
 oox/source/ole/vbaproject.cxx |   79 ++
 sc/source/filter/oox/workbookfragment.cxx |   23 +---
 sc/source/filter/oox/workbookhelper.cxx   |2 
 sc/source/ui/unoobj/servuno.cxx   |2 
 6 files changed, 80 insertions(+), 47 deletions(-)

New commits:
commit d51039de69b2e10f559c5ea6dd9859b1c29d8788
Author: Noel Power 
Date:   Tue Jun 4 15:24:29 2013 +0100

fix for fdo#53042 fix ole object macro bindings ( for xlsm )

A number of fixes needed here
a) make sure convert properties of control model is done before inserting
control model into formcontainer, need to do that to ensure that
GenerateVBAEvents is set ( so the fake VBA event generation can be
triggered )
b) remove the IsAlieanExcel check in servuno.cxx ( it's too strict and
additionally seems there is confusion over the media type to check )
c) split the vba import so that we can ensure the VBA mode is set (if
we have modules to import ) before sheets are imported and defer further
processing ( actual assigning of the modules and associated objects )
until later

Change-Id: I8fdbe788b400d7e41d4cc4b51b15f692bd7b0ecc

diff --git a/include/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx
index f742138..55ac3a8 100644
--- a/include/oox/ole/vbaproject.hxx
+++ b/include/oox/ole/vbaproject.hxx
@@ -25,6 +25,7 @@
 #include "oox/helper/refvector.hxx"
 #include "oox/helper/storagebase.hxx"
 #include "oox/dllapi.h"
+#include "oox/ole/vbamodule.hxx"
 
 namespace com { namespace sun { namespace star {
 namespace container { class XNameContainer; }
@@ -126,7 +127,12 @@ public:
 boolimportVbaProject(
 StorageBase& rVbaPrjStrg );
 
-/** Registers a macro atatcher object. For details, see description of the
+/** Reads vba module related information from the project streams */
+voidreadVbaModules( StorageBase& rVbaPrjStrg );
+/** Imports (and creates) vba modules and user forms from the vba project 
records previously read.
+  Note: ( expects that readVbaModules was already called ) */
+voidimportModulesAndForms( StorageBase& rVbaPrjStrg, const 
GraphicHelper& rGraphicHelper, bool bDefaultColorBgr = true );
+/** Registers a macro attacher object. For details, see description of the
 VbaMacroAttacherBase class. */
 voidregisterMacroAttacher( const VbaMacroAttacherRef& 
rxAttacher );
 
@@ -194,6 +200,9 @@ private:
 OUString maPrjName;  ///< Name of the VBA project.
 ::com::sun::star::uno::Reference< 
::com::sun::star::container::XNameContainer >
 mxOleOverridesSink;
+typedef RefMap< rtl::OUString, VbaModule > VbaModuleMap;
+VbaModuleMap maModules;
+VbaModuleMap maModulesByStrm;
 };
 
 // 
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index d5303a4..23f08e3 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -2704,6 +2704,7 @@ EmbeddedForm::EmbeddedForm( const Reference< XModel >& 
rxDocModel,
 
 Reference< XControlModel > EmbeddedForm::convertAndInsert( const 
EmbeddedControl& rControl, sal_Int32& rnCtrlIndex )
 {
+Reference< XControlModel > xRet;
 if( mxModelFactory.is() && rControl.hasModel() ) try
 {
 // create the UNO control model
@@ -2711,20 +2712,19 @@ Reference< XControlModel > 
EmbeddedForm::convertAndInsert( const EmbeddedControl
 Reference< XFormComponent > xFormComp( mxModelFactory->createInstance( 
aServiceName ), UNO_QUERY_THROW );
 Reference< XControlModel > xCtrlModel( xFormComp, UNO_QUERY_THROW );
 
+// convert the control properties
+if( rControl.convertProperties( xCtrlModel, maControlConv ) )
+xRet = xCtrlModel;
 // insert the control into the form
 Reference< XIndexContainer > xFormIC( createXForm(), UNO_SET_THROW );
 rnCtrlIndex = xFormIC->getCount();
 xFormIC->insertByIndex( rnCtrlIndex, Any( xFormComp ) );
-
-// convert the control properties
-if( rControl.convertProperties( xCtrlModel, maControlConv ) )
-return xCtrlModel;
 }
 catch (const Exception& e)
 {
 SAL_WARN("oox", "exception creating Control: " << e.Message);
 }
-return Reference< XControlModel >();
+return xRet;
 }
 
 Reference< XIndexContainer > EmbeddedForm::createXForm()
diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx
index 91be356..b58710d 100644
--- a/oox/source/ole/vbaproject.cxx
+++ b/oox/source/ole/vbaproject.cxx
@@ -264,8 +264,14 @@ Reference< XNameContainer > 
VbaProject::createDialogLibrary()
 
 void VbaProject::importVba( StorageBase& rVbaPrjStrg,

Re: when running gdb I cannot find crti.S

[Stephan Bergmann]

On 01/08/2014 05:12 PM, Alex McMurchy wrote:

This is what I get towards the back end of gdb when assigning it to a running
soffice.bin -

Reading symbols from
/home/libreoffice/Downloads/core/instdir/ure/lib/libreflectionlo.so...done.
Loaded symbols for
/home/libreoffice/Downloads/core/instdir/ure/lib/libreflectionlo.so
Reading symbols from
/home/libreoffice/Downloads/core/instdir/program/../program/libfwllo.so...done.
Loaded symbols for
/home/libreoffice/Downloads/core/instdir/program/../program/libfwllo.so
0xb75725b1 in poll () from /lib/libc.so.6
Traceback (most recent call last):
   File "/usr/share/gdb/auto-load/usr/lib/libgobject-2.0.so.0.3600.4-gdb.py",
line 9, in 
 from gobject import register
   File "/usr/share/glib-2.0/gdb/gobject.py", line 3, in 
 import gdb.backtrace
ImportError: No module named backtrace
(gdb) list
1   ../sysdeps/i386/crti.S: No such file or directory.
(gdb)


The thread that gdb happens to make the "current" one when it stopped 
soffice.bin after attaching apparently happens to be in a runtime 
library function for which you have no source code around.  Use "thread" 
and "frame" commands to go to a meanigful frame to "list".


Stephan

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 06/81d4e0cd7425349600672964e48a5dbbb3c7db

[Caolán McNamara]

 06/81d4e0cd7425349600672964e48a5dbbb3c7db |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6be3f6a157089c55d2ed87ba3c51219a682c727e
Author: Caolán McNamara 
Date:   Wed Jan 8 16:09:19 2014 +

Notes added by 'git notes add'

diff --git a/06/81d4e0cd7425349600672964e48a5dbbb3c7db 
b/06/81d4e0cd7425349600672964e48a5dbbb3c7db
new file mode 100644
index 000..d7c79c7
--- /dev/null
+++ b/06/81d4e0cd7425349600672964e48a5dbbb3c7db
@@ -0,0 +1 @@
+merged as: 235c790fdb04c27487de4510a0d51323f5442e70
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

when running gdb I cannot find crti.S

[Alex McMurchy]

After a successful autogen with the --enable-dbgutil flag set and a successful 
make, I can't seem to get gdb to debug libreoffice. 

I've probably done something silly or missed out something obvious as I've 
never had problems before in running gdb against Libreoffice. 

I've tested gdb against an "Hello World" program and got expected results see 
below.

Any suggestions greatfully recevied.

Alex



This is what I get towards the back end of gdb when assigning it to a running 
soffice.bin -

Reading symbols from 
/home/libreoffice/Downloads/core/instdir/ure/lib/libreflectionlo.so...done.
Loaded symbols for 
/home/libreoffice/Downloads/core/instdir/ure/lib/libreflectionlo.so
Reading symbols from 
/home/libreoffice/Downloads/core/instdir/program/../program/libfwllo.so...done. 


Loaded symbols for 
/home/libreoffice/Downloads/core/instdir/program/../program/libfwllo.so 

  
0xb75725b1 in poll () from /lib/libc.so.6   

 
Traceback (most recent call last):  

 
  File "/usr/share/gdb/auto-load/usr/lib/libgobject-2.0.so.0.3600.4-gdb.py", 
line 9, in  

from gobject import register

 
  File "/usr/share/glib-2.0/gdb/gobject.py", line 3, in 

 
import gdb.backtrace

 
ImportError: No module named backtrace  

 
(gdb) list  

 
1   ../sysdeps/i386/crti.S: No such file or directory.  

 
(gdb)  

The "Hello World" results -

552 /home/libreoffice/gdb$ gdb hello

GNU gdb (GDB) 7.6.1
Copyright (C) 2013 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later 
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.  Type "show copying"
and "show warranty" for details.
This GDB was configured as "i486-slackware-linux".
For bug reporting instructions, please see:
...
Reading symbols from /home/libreoffice/gdb/hello...done.
(gdb) list
1   //C hello world example
2   #include 
3
4   int main()
5   {
6 printf("Hello world\n");
7 return 0;
8   }
(gdb) quit

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

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

[Tsutomu Uchino]

 sw/source/core/doc/doclay.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 235c790fdb04c27487de4510a0d51323f5442e70
Author: Tsutomu Uchino 
Date:   Wed Jan 8 12:38:09 2014 +

Resolves: #i51453# avoid relative sizing for the picture and...

formula wrapped by inserted frame when caption is added

(cherry picked from commit 0681d4e0cd7425349600672964e48a5dbbb3c7db)

Change-Id: Ie526391b8676c259a77060dbe04c3e7c8ad499c0

diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index cb93f96..4b906e8 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -1319,7 +1319,7 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const 
pTxtFmtCollTbl,
 pNewSet->Put( SwFmtHoriOrient( 0, 
text::HoriOrientation::CENTER ) );
 
 aFrmSize = pOldFmt->GetFrmSize();
-aFrmSize.SetWidthPercent( 100 );
+aFrmSize.SetWidthPercent( 0 );
 aFrmSize.SetHeightPercent( 255 );
 pNewSet->Put( aFrmSize );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sw/inc sw/source xmloff/source

[Oliver-Rainer Wittmann]

 sw/inc/IDocumentMarkAccess.hxx |2 
 sw/inc/doc.hxx |   38 ---
 sw/source/core/crsr/annotationmark.cxx |1 
 sw/source/core/doc/docbm.cxx   |  106 -
 sw/source/core/doc/doccorr.cxx |   20 +++---
 sw/source/core/undo/undobj.cxx |   13 +++-
 sw/source/core/unocore/unoobj.cxx  |   72 +-
 sw/source/ui/docvw/SidebarWin.cxx  |   25 ++-
 sw/source/ui/shells/textfld.cxx|3 
 sw/source/ui/wrtsh/wrtsh2.cxx  |   21 +-
 xmloff/source/text/txtfldi.cxx |4 -
 11 files changed, 200 insertions(+), 105 deletions(-)

New commits:
commit c25523dd3a302d1bd36297a817a869afb3605d1f
Author: Oliver-Rainer Wittmann 
Date:   Wed Jan 8 14:20:43 2014 +

123792: correction for comments/annotations on table cell ranges

diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx
index d263d0e..7cde48a 100644
--- a/sw/inc/IDocumentMarkAccess.hxx
+++ b/sw/inc/IDocumentMarkAccess.hxx
@@ -260,7 +260,7 @@ class IDocumentMarkAccess
 virtual const_iterator_t findAnnotationMark( const ::rtl::OUString& 
rName ) const = 0;
 
 // Returns the MarkType used to create the mark
-static MarkType SAL_DLLPUBLIC_EXPORT GetType(const ::sw::mark::IMark& 
rMark);
+static SAL_DLLPUBLIC_EXPORT MarkType GetType(const ::sw::mark::IMark& 
rMark);
 
 static SAL_DLLPUBLIC_EXPORT const ::rtl::OUString& 
GetCrossRefHeadingBookmarkNamePrefix();
 static SAL_DLLPUBLIC_EXPORT bool IsLegalPaMForCrossRefHeadingBookmark( 
const SwPaM& );
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 3f67f86..d18e58b 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1491,18 +1491,32 @@ public:
 // wie z.B. die ::com::sun::star::text::Bookmarks oder die 
Verzeichnisse.
 // JP 22.06.95: ist bMoveCrsr gesetzt, verschiebe auch die Crsr
 
-// Setzt alles in rOldNode auf rNewPos + Offset
-void CorrAbs( const SwNodeIndex& rOldNode, const SwPosition& rNewPos,
-const xub_StrLen nOffset = 0, sal_Bool bMoveCrsr = 
sal_False );
-// Setzt alles im Bereich von [rStartNode, rEndNode] nach rNewPos
-void CorrAbs( const SwNodeIndex& rStartNode, const SwNodeIndex& rEndNode,
-const SwPosition& rNewPos, sal_Bool bMoveCrsr = sal_False 
);
-// Setzt alles im Bereich von rRange nach rNewPos
-void CorrAbs( const SwPaM& rRange, const SwPosition& rNewPos,
-sal_Bool bMoveCrsr = sal_False );
-// Setzt alles in rOldNode auf relative Pos
-void CorrRel( const SwNodeIndex& rOldNode, const SwPosition& rNewPos,
-const xub_StrLen nOffset = 0, sal_Bool bMoveCrsr = 
sal_False );
+// Setzt alles in rOldNode auf rNewPos + Offset
+void CorrAbs(
+const SwNodeIndex& rOldNode,
+const SwPosition& rNewPos,
+const xub_StrLen nOffset = 0,
+sal_Bool bMoveCrsr = sal_False );
+
+// Setzt alles im Bereich von [rStartNode, rEndNode] nach rNewPos
+void CorrAbs(
+const SwNodeIndex& rStartNode,
+const SwNodeIndex& rEndNode,
+const SwPosition& rNewPos,
+sal_Bool bMoveCrsr = sal_False );
+
+// Setzt alles im Bereich von rRange nach rNewPos
+void CorrAbs(
+const SwPaM& rRange,
+const SwPosition& rNewPos,
+sal_Bool bMoveCrsr = sal_False );
+
+// Setzt alles in rOldNode auf relative Pos
+void CorrRel(
+const SwNodeIndex& rOldNode,
+const SwPosition& rNewPos,
+const xub_StrLen nOffset = 0,
+sal_Bool bMoveCrsr = sal_False );
 
 // GliederungsRegeln erfragen / setzen
 // --> OD 2005-11-02 #i51089 - TUNING#
diff --git a/sw/source/core/crsr/annotationmark.cxx 
b/sw/source/core/crsr/annotationmark.cxx
index 1c81537..47a92d0 100755
--- a/sw/source/core/crsr/annotationmark.cxx
+++ b/sw/source/core/crsr/annotationmark.cxx
@@ -60,6 +60,7 @@ namespace sw { namespace mark
 SwTxtFld* pTxtFld =
 GetMarkEnd().nNode.GetNode().GetTxtNode()->GetFldTxtAttrAt(
 GetMarkEnd().nContent.GetIndex()-1, true );
+ASSERT( pTxtFld != NULL, " - missing text 
attribute for annotation field!" );
 if ( pTxtFld != NULL )
 {
 const SwPostItField* pPostItField = dynamic_cast< const 
SwPostItField* >(pTxtFld->GetFmtFld().GetField());
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index fc091af..07890d6 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -161,18 +161,34 @@ namespace
 return max_element(vCandidates.begin(), vCandidates.end(), 
&lcl_MarkOrderingByEnd)->get();
 }
 
-static bool lcl_FixCorrectedMark(bool bChangedPos, bool bChangedOPos, 
MarkBase* io_pMark)
+static bool lcl_FixCorrectedMark(
+const bool bChangedPos,
+const bool bChangedOPos,
+MarkBase* io_pMark )

[Libreoffice-commits] core.git: configure.ac download.lst external/mdds

[Kohei Yoshida]

 configure.ac |
2 
 download.lst |
2 
 external/mdds/0001-Add-a-method-to-set-empty-to-a-span-of-elements.patch |   
54 --
 external/mdds/0001-Workaround-for-an-old-gcc-bug.patch   |   
27 -
 external/mdds/UnpackedTarball_mdds.mk|
2 
 5 files changed, 2 insertions(+), 85 deletions(-)

New commits:
commit 12890dd7adfc70bc562bb2760084515cc1269a38
Author: Kohei Yoshida 
Date:   Wed Jan 8 10:50:26 2014 -0500

Update mdds to 0.10.1, set it as the required baseline.

This update will obsolete two patches that were previously applied.

Change-Id: I521e939905e473ca5d440dea3b03faeb9af4c0fb

diff --git a/configure.ac b/configure.ac
index 67efcce..fcf8fd1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8760,7 +8760,7 @@ AC_SUBST(SYSTEM_BOOST)
 dnl ===
 dnl Check for system mdds
 dnl ===
-libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds >= 0.9.1])
+libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds >= 0.10.1])
 
 dnl ===
 dnl Determine which hash container mdds shall use
diff --git a/download.lst b/download.lst
index e8ccd54..5049b0d 100644
--- a/download.lst
+++ b/download.lst
@@ -80,7 +80,7 @@ export LIBXML_TARBALL := 
9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz
 export LIBXSLT_TARBALL := 
9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 export MARIADB_TARBALL := 
05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2
-export MDDS_TARBALL := 26272a8e8c984d21ba800b4edcd3ada8-mdds_0.10.0.tar.bz2
+export MDDS_TARBALL := 01a380acfec23bf617117ce98e318f3d-mdds_0.10.1.tar.bz2
 export MYSQLCPPCONN_TARBALL := 
0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
 export MYTHES_TARBALL := 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz
 export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
diff --git 
a/external/mdds/0001-Add-a-method-to-set-empty-to-a-span-of-elements.patch 
b/external/mdds/0001-Add-a-method-to-set-empty-to-a-span-of-elements.patch
deleted file mode 100644
index c905cea..000
--- a/external/mdds/0001-Add-a-method-to-set-empty-to-a-span-of-elements.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From d0a006ad2fcabd1e785787b9a5c84b32edbab780 Mon Sep 17 00:00:00 2001
-From: Kohei Yoshida 
-Date: Tue, 7 Jan 2014 15:43:36 -0500
-Subject: [PATCH] Add a method to set empty to a span of elements.
-

- include/mdds/multi_type_matrix.hpp |  9 +
- include/mdds/multi_type_matrix_def.inl | 10 ++
- 2 files changed, 19 insertions(+)
-
-diff --git a/include/mdds/multi_type_matrix.hpp 
b/include/mdds/multi_type_matrix.hpp
-index a30393f..0574466 100644
 a/include/mdds/multi_type_matrix.hpp
-+++ b/c/d/include/mdds/multi_type_matrix.hpp
-@@ -377,6 +377,15 @@ public:
- void set_empty(size_type row, size_type col);
- 
- /**
-+ * Set specified range of elements empty.
-+ *
-+ * @param row row position of the first element.
-+ * @param col column position of the first element.
-+ * @param length length of the range to set empty.
-+ */
-+void set_empty(size_type row, size_type col, size_type length);
-+
-+/**
-  * Set element referenced by the position object empty.
-  *
-  * @param pos position object that references element.
-diff --git a/include/mdds/multi_type_matrix_def.inl 
b/include/mdds/multi_type_matrix_def.inl
-index 21fe866..36f5448 100644
 a/include/mdds/multi_type_matrix_def.inl
-+++ b/c/d/include/mdds/multi_type_matrix_def.inl
-@@ -240,6 +240,16 @@ void multi_type_matrix<_String>::set_empty(size_type row, 
size_type col)
- }
- 
- template
-+void multi_type_matrix<_String>::set_empty(size_type row, size_type col, 
size_type length)
-+{
-+if (length == 0)
-+throw general_error("multi_type_matrix::set_empty: length of zero is 
not permitted.");
-+
-+size_type pos1 = get_pos(row, col);
-+m_store.set_empty(pos1, pos1+length-1);
-+}
-+
-+template
- typename multi_type_matrix<_String>::position_type
- multi_type_matrix<_String>::set_empty(const position_type& pos)
- {
--- 
-1.8.1.4
-
diff --git a/external/mdds/0001-Workaround-for-an-old-gcc-bug.patch 
b/external/mdds/0001-Workaround-for-an-old-gcc-bug.patch
deleted file mode 100644
index 8529fbf..000
--- a/external/mdds/0001-Workaround-for-an-old-gcc-bug.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 3e3a5c483217fe05b5bd556bf1b2c6f3ec297cb1 Mon Sep 17 00:00:00 2001
-From: Kohei Yoshida 
-Date: Sat, 22 Jun 2013 21:30:13 -0400
-Subject: [PATCH] Workaround for an old gcc bug.
-
-c.f. http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44963

- 

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

Bug 65675 depends on bug 73007, which changed state.

Bug 73007 Summary: Calc: Value in the last cell repeats when scrolling with 
scroll bar
https://bugs.freedesktop.org/show_bug.cgi?id=73007

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution|--- |DUPLICATE

-- 
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 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

Bug 65675 depends on bug 73007, which changed state.

Bug 73007 Summary: Calc: Value in the last cell repeats when scrolling with 
scroll bar
https://bugs.freedesktop.org/show_bug.cgi?id=73007

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|DUPLICATE   |---

-- 
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] core.git: Branch 'refs/notes/commits' - 52/1a37188a6a6a5a520e449e6572c2896ee37d54

[Caolán McNamara]

 52/1a37188a6a6a5a520e449e6572c2896ee37d54 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit bbe61d78454c98975c745fd02f14d31a2e579930
Author: Caolán McNamara 
Date:   Wed Jan 8 15:26:00 2014 +

Notes added by 'git notes add'

diff --git a/52/1a37188a6a6a5a520e449e6572c2896ee37d54 
b/52/1a37188a6a6a5a520e449e6572c2896ee37d54
new file mode 100644
index 000..baa6629
--- /dev/null
+++ b/52/1a37188a6a6a5a520e449e6572c2896ee37d54
@@ -0,0 +1 @@
+prefer: 452e452d3e9dcc259bc3e58ed6509284004f04fe
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - connectivity/source

[Lionel Elie Mamane]

 connectivity/source/drivers/jdbc/CallableStatement.cxx |4 
 connectivity/source/drivers/jdbc/PreparedStatement.cxx |5 +
 2 files changed, 9 insertions(+)

New commits:
commit 515c6cf7a3832bfc7a6eeed65704bc9eee96adc1
Author: Lionel Elie Mamane 
Date:   Mon Jan 6 16:40:59 2014 +0100

fdo#37167 create statement before execute/wasNull/getBoolean

This populates "object" member variable.

The "createStatement" calls were removed in:

 commit b9392a36645d8632b97ad79240f483b3a1683b61
 Author: Ivo Hinkelmann 
 Date:   Thu Apr 23 10:42:05 2009 +

CWS-TOOLING: integrate CWS dbaperf1

This was most probably in error since the call is not removed from the
other modified member functions in this commit and/or failed to
aaccount for the scenario of no parameter (and thus no setXXX call
before execute).

Change-Id: Ic0e7b7b64ea496791f32c1416aa7d4416f909616
Reviewed-on: https://gerrit.libreoffice.org/7280
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/connectivity/source/drivers/jdbc/CallableStatement.cxx 
b/connectivity/source/drivers/jdbc/CallableStatement.cxx
index 7ab349f..50cce64 100644
--- a/connectivity/source/drivers/jdbc/CallableStatement.cxx
+++ b/connectivity/source/drivers/jdbc/CallableStatement.cxx
@@ -69,12 +69,16 @@ Any SAL_CALL java_sql_CallableStatement::queryInterface( 
const Type & rType ) th
 // -
 sal_Bool SAL_CALL java_sql_CallableStatement::wasNull(  ) 
throw(starsdbc::SQLException, RuntimeException)
 {
+SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
+createStatement(t.pEnv);
 static jmethodID mID(NULL);
 return callBooleanMethod( "wasNull", mID );
 }
 
 sal_Bool SAL_CALL java_sql_CallableStatement::getBoolean( sal_Int32 
columnIndex ) throw(starsdbc::SQLException, RuntimeException)
 {
+SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
+createStatement(t.pEnv);
 static jmethodID mID(NULL);
 return callBooleanMethodWithIntArg( "getBoolean", mID,columnIndex );
 }
diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx 
b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
index 0458ad7..5f9dafe 100644
--- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
+++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
@@ -96,6 +96,8 @@ sal_Bool SAL_CALL java_sql_PreparedStatement::execute(  ) 
throw(::com::sun::star
 ::osl::MutexGuard aGuard( m_aMutex );
 checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
 
+SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
+createStatement(t.pEnv);
 static jmethodID mID(NULL);
 return callBooleanMethod( "execute", mID );
 }
@@ -106,6 +108,9 @@ sal_Int32 SAL_CALL 
java_sql_PreparedStatement::executeUpdate(  ) throw(::com::su
 ::osl::MutexGuard aGuard( m_aMutex );
 checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
 m_aLogger.log( LogLevel::FINE, STR_LOG_EXECUTING_PREPARED_UPDATE );
+
+SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
+createStatement(t.pEnv);
 static jmethodID mID(NULL);
 return callIntMethod("executeUpdate",mID);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - desktop/source i18npool/source

[Stephan Bergmann]

 desktop/source/splash/splash.cxx  |   18 --
 desktop/source/splash/unxsplash.cxx   |   20 
 desktop/source/splash/unxsplash.hxx   |   13 +++--
 i18npool/source/localedata/localedata.cxx |6 ++
 4 files changed, 49 insertions(+), 8 deletions(-)

New commits:
commit 8389519a23470b104b28ad497eb61a66ba92b81e
Author: Stephan Bergmann 
Date:   Wed Jan 8 15:04:56 2014 +0100

Missing XServiceInfo

Change-Id: Ifc5454bbcd29730002b0a3261d2c34dee8ffb843

diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index ad06ead..3ce90a4 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -26,9 +26,11 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
-#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -46,7 +48,7 @@ using namespace ::com::sun::star::uno;
 namespace {
 
 class  SplashScreen
-: public ::cppu::WeakImplHelper2< XStatusIndicator, XInitialization >
+: public ::cppu::WeakImplHelper3< XStatusIndicator, XInitialization, 
XServiceInfo >
 , public IntroWindow
 {
 private:
@@ -99,6 +101,18 @@ public:
 virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< 
::com::sun::star::uno::Any>& aArguments )
 throw ( RuntimeException );
 
+virtual OUString SAL_CALL getImplementationName()
+throw (css::uno::RuntimeException)
+{ return desktop::splash::getImplementationName(); }
+
+virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
+throw (css::uno::RuntimeException)
+{ return cppu::supportsService(this, ServiceName); }
+
+virtual css::uno::Sequence SAL_CALL getSupportedServiceNames()
+throw (css::uno::RuntimeException)
+{ return desktop::splash::getSupportedServiceNames(); }
+
 // workwindow
 virtual void Paint( const Rectangle& );
 
diff --git a/desktop/source/splash/unxsplash.cxx 
b/desktop/source/splash/unxsplash.cxx
index 665a106..6c1a829 100644
--- a/desktop/source/splash/unxsplash.cxx
+++ b/desktop/source/splash/unxsplash.cxx
@@ -22,6 +22,7 @@
 #include 
 //#include 
 #include 
+#include 
 #include 
 #include 
 
@@ -118,6 +119,25 @@ UnxSplashScreen::initialize( const 
::com::sun::star::uno::Sequence< ::com::sun::
 }
 }
 }
+
+OUString UnxSplashScreen::getImplementationName()
+throw (css::uno::RuntimeException)
+{
+return UnxSplash_getImplementationName();
+}
+
+sal_Bool UnxSplashScreen::supportsService(OUString const & ServiceName)
+throw (css::uno::RuntimeException)
+{
+return cppu::supportsService(this, ServiceName);
+}
+
+css::uno::Sequence UnxSplashScreen::getSupportedServiceNames()
+throw (css::uno::RuntimeException)
+{
+return UnxSplash_getSupportedServiceNames();
+}
+
 }
 
 using namespace desktop;
diff --git a/desktop/source/splash/unxsplash.hxx 
b/desktop/source/splash/unxsplash.hxx
index a1282bb..fef8cef 100644
--- a/desktop/source/splash/unxsplash.hxx
+++ b/desktop/source/splash/unxsplash.hxx
@@ -16,7 +16,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -29,7 +29,7 @@ using namespace ::com::sun::star::uno;
 
 namespace desktop {
 
-class  UnxSplashScreen : public ::cppu::WeakImplHelper2< 
css::task::XStatusIndicator, css::lang::XInitialization >
+class  UnxSplashScreen : public ::cppu::WeakImplHelper3< 
css::task::XStatusIndicator, css::lang::XInitialization, 
css::lang::XServiceInfo >
 {
 private:
 // don't allow anybody but ourselves to create instances of this class
@@ -58,6 +58,15 @@ public:
 
 // XInitialize
 virtual void SAL_CALL initialize( const css::uno::Sequence< 
css::uno::Any>& aArguments ) throw ( css::uno::RuntimeException );
+
+virtual OUString SAL_CALL getImplementationName()
+throw (css::uno::RuntimeException);
+
+virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
+throw (css::uno::RuntimeException);
+
+virtual css::uno::Sequence SAL_CALL getSupportedServiceNames()
+throw (css::uno::RuntimeException);
 };
 
 }
commit 6dfc7d12c56fb585edff2cc4f6f37d53398cf751
Author: Stephan Bergmann 
Date:   Wed Jan 8 14:51:55 2014 +0100

Fix LocaleDataImpl::getImplementationName

Change-Id: I36dd015635c30f63e2085c250e159fbd536da611

diff --git a/i18npool/source/localedata/localedata.cxx 
b/i18npool/source/localedata/localedata.cxx
index a2f9490..da49400 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -32,8 +32,6 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star;
 
-static const sal_Char clocaledata[] = "com.sun.star.i18n.LocaleData";
-
 typedef sal_Unicode**   (SAL_CALL * MyFunc_Type)( sal_Int16&);
 typedef sal_Unicode***  (SAL_CALL * MyFunc_Type2)( sal_Int16&, sal_Int16& );
 typedef sal_Unicode (SAL_CALL * MyFunc_Type3)( sal_Int16&, sal_Int16&, 
sal_I

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - connectivity/source

[Lionel Elie Mamane]

 connectivity/source/drivers/jdbc/CallableStatement.cxx |4 
 connectivity/source/drivers/jdbc/PreparedStatement.cxx |5 +
 2 files changed, 9 insertions(+)

New commits:
commit 85cf6f6f210eaf427ff91d59325122eb7a4e54d1
Author: Lionel Elie Mamane 
Date:   Mon Jan 6 16:40:59 2014 +0100

fdo#37167 create statement before execute/wasNull/getBoolean

This populates "object" member variable.

The "createStatement" calls were removed in:

 commit b9392a36645d8632b97ad79240f483b3a1683b61
 Author: Ivo Hinkelmann 
 Date:   Thu Apr 23 10:42:05 2009 +

CWS-TOOLING: integrate CWS dbaperf1

This was most probably in error since the call is not removed from the
other modified member functions in this commit and/or failed to
aaccount for the scenario of no parameter (and thus no setXXX call
before execute).

Change-Id: Ic0e7b7b64ea496791f32c1416aa7d4416f909616
Reviewed-on: https://gerrit.libreoffice.org/7281
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/connectivity/source/drivers/jdbc/CallableStatement.cxx 
b/connectivity/source/drivers/jdbc/CallableStatement.cxx
index 7ab349f..50cce64 100644
--- a/connectivity/source/drivers/jdbc/CallableStatement.cxx
+++ b/connectivity/source/drivers/jdbc/CallableStatement.cxx
@@ -69,12 +69,16 @@ Any SAL_CALL java_sql_CallableStatement::queryInterface( 
const Type & rType ) th
 // -
 sal_Bool SAL_CALL java_sql_CallableStatement::wasNull(  ) 
throw(starsdbc::SQLException, RuntimeException)
 {
+SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
+createStatement(t.pEnv);
 static jmethodID mID(NULL);
 return callBooleanMethod( "wasNull", mID );
 }
 
 sal_Bool SAL_CALL java_sql_CallableStatement::getBoolean( sal_Int32 
columnIndex ) throw(starsdbc::SQLException, RuntimeException)
 {
+SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
+createStatement(t.pEnv);
 static jmethodID mID(NULL);
 return callBooleanMethodWithIntArg( "getBoolean", mID,columnIndex );
 }
diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx 
b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
index 59a4b29..774d130 100644
--- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
+++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
@@ -96,6 +96,8 @@ sal_Bool SAL_CALL java_sql_PreparedStatement::execute(  ) 
throw(::com::sun::star
 ::osl::MutexGuard aGuard( m_aMutex );
 checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
 
+SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
+createStatement(t.pEnv);
 static jmethodID mID(NULL);
 return callBooleanMethod( "execute", mID );
 }
@@ -106,6 +108,9 @@ sal_Int32 SAL_CALL 
java_sql_PreparedStatement::executeUpdate(  ) throw(::com::su
 ::osl::MutexGuard aGuard( m_aMutex );
 checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
 m_aLogger.log( LogLevel::FINE, STR_LOG_EXECUTING_PREPARED_UPDATE );
+
+SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
+createStatement(t.pEnv);
 static jmethodID mID(NULL);
 return callIntMethod("executeUpdate",mID);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 82/09527470c4f327f8050d66b07ba46f206f44bd

[Caolán McNamara]

 82/09527470c4f327f8050d66b07ba46f206f44bd |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 9001dc8fc0f56c08b3af7432ee5bbe6ca9810305
Author: Caolán McNamara 
Date:   Wed Jan 8 15:17:04 2014 +

Notes added by 'git notes add'

diff --git a/82/09527470c4f327f8050d66b07ba46f206f44bd 
b/82/09527470c4f327f8050d66b07ba46f206f44bd
new file mode 100644
index 000..2cc2a9e
--- /dev/null
+++ b/82/09527470c4f327f8050d66b07ba46f206f44bd
@@ -0,0 +1 @@
+prefer: 25f935bfb44b87271eb11e719c4d1fb8624bdd02
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sd/source

[Caolán McNamara]

 sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx |   33 ++---
 sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx |   12 +--
 2 files changed, 38 insertions(+), 7 deletions(-)

New commits:
commit 152b0dd43165106f9c01bab33017e23dadf91fb6
Author: Caolán McNamara 
Date:   Thu Dec 12 10:39:06 2013 +

fix occasional crash on dragging and dropping pages in slidesorters

pages go into the cache, and sometimes they get deleted before the
cache gets processed. Remove deleted pages when they go away

Change-Id: I291072a8541f4ca36979e9914975d81cc23a9497
(cherry picked from commit abe9d1463282690313aaf91d2a54011d10b900b9)
(cherry picked from commit 026e9335d792c6557255f064960e0ef6d28728e0)
Reviewed-on: https://gerrit.libreoffice.org/7053
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx 
b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
index 835787b..cdc2b57 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
@@ -94,6 +94,7 @@ RequestQueue::RequestQueue (const SharedCacheContext& 
rpCacheContext)
 
 RequestQueue::~RequestQueue (void)
 {
+Clear();
 }
 
 
@@ -120,7 +121,15 @@ void RequestQueue::AddRequest (
 // order.
 sal_Int32 nPriority (mpCacheContext->GetPriority(aKey));
 Request aRequest (aKey, nPriority, eRequestClass);
-mpRequestQueue->insert(aRequest);
+
+std::pair ret = mpRequestQueue->insert(aRequest);
+bool bInserted = ret.second == true;
+
+if (bInserted)
+{
+SdrPage *pPage = const_cast(aRequest.maKey);
+pPage->AddPageUser(*this);
+}
 
 SSCD_SET_REQUEST_CLASS(aKey,eRequestClass);
 
@@ -131,8 +140,11 @@ void RequestQueue::AddRequest (
 #endif
 }
 
-
-
+void RequestQueue::PageInDestruction(const SdrPage& rPage)
+{
+//remove any requests pending for this page which is going away now
+RemoveRequest(&rPage);
+}
 
 bool RequestQueue::RemoveRequest (
 CacheKey aKey)
@@ -152,7 +164,11 @@ bool RequestQueue::RemoveRequest (
 mnMinimumPriority++;
 else if (aRequestIterator->mnPriorityInClass == 
mnMaximumPriority-1)
 mnMaximumPriority--;
+
+SdrPage *pPage = const_cast(aRequestIterator->maKey);
+pPage->RemovePageUser(*this);
 mpRequestQueue->erase(aRequestIterator);
+
 bRequestWasRemoved = true;
 
 if (bRequestWasRemoved)
@@ -229,7 +245,10 @@ void RequestQueue::PopFront (void)
 {
 SSCD_SET_STATUS(maRequestQueue.begin()->mpData->GetPage(),NONE);
 
-mpRequestQueue->erase(mpRequestQueue->begin());
+Container::const_iterator aIter(mpRequestQueue->begin());
+SdrPage *pPage = const_cast(aIter->maKey);
+pPage->RemovePageUser(*this);
+mpRequestQueue->erase(aIter);
 
 // Reset the priority counter if possible.
 if (mpRequestQueue->empty())
@@ -256,6 +275,12 @@ void RequestQueue::Clear (void)
 {
 ::osl::MutexGuard aGuard (maMutex);
 
+for (Container::iterator aI = mpRequestQueue->begin(), aEnd = 
mpRequestQueue->end(); aI != aEnd; ++aI)
+{
+SdrPage *pPage = const_cast(aI->maKey);
+pPage->RemovePageUser(*this);
+}
+
 mpRequestQueue->clear();
 mnMinimumPriority = 0;
 mnMaximumPriority = 1;
diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx 
b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
index 78a4627..088a135 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
@@ -24,7 +24,8 @@
 #include "cache/SlsCacheContext.hxx"
 #include "taskpane/SlideSorterCacheDisplay.hxx"
 #include 
-#include "osl/mutex.hxx"
+#include 
+#include 
 
 
 namespace sd { namespace slidesorter { namespace cache {
@@ -34,11 +35,11 @@ class RequestData;
 /** The request queue stores requests that are described by the RequestData
 sorted according to priority class and then priority.
 */
-class RequestQueue
+class RequestQueue : public sdr::PageUser
 {
 public:
 RequestQueue (const SharedCacheContext& rpCacheContext);
-~RequestQueue (void);
+virtual ~RequestQueue();
 
 /** Insert a request with highest or lowest priority in its priority
 class.  When the request is already present then it is first
@@ -99,6 +100,11 @@ public:
 */
 ::osl::Mutex& GetMutex (void);
 
+/** Ensure we don't hand out a page deleted before anyone got a
+chance to process it
+*/
+virtual void PageInDestruction(const SdrPage& rPage);
+
 private:
 ::osl::Mutex maMutex;
 class Container;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 08/efcbcf9b5f8ffcb7dbc82abb2eed1fab22e528

[Caolán McNamara]

 08/efcbcf9b5f8ffcb7dbc82abb2eed1fab22e528 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d0365325a39d515327b4fd67843d5ad83f2b2aaa
Author: Caolán McNamara 
Date:   Wed Jan 8 15:12:47 2014 +

Notes added by 'git notes add'

diff --git a/08/efcbcf9b5f8ffcb7dbc82abb2eed1fab22e528 
b/08/efcbcf9b5f8ffcb7dbc82abb2eed1fab22e528
new file mode 100644
index 000..c6af10a
--- /dev/null
+++ b/08/efcbcf9b5f8ffcb7dbc82abb2eed1fab22e528
@@ -0,0 +1 @@
+prefer: e76df814a59cf19cf052f9a4c82f005ff0bf60f6
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - eb/d2922ebd3cf2d3899fb80780d38f367197aadf

[Miklos Vajna]

 eb/d2922ebd3cf2d3899fb80780d38f367197aadf |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d8d19babe5293c43fa26c9bfa49f319c2dbd5468
Author: Miklos Vajna 
Date:   Wed Jan 8 16:01:18 2014 +0100

Notes added by 'git notes add'

diff --git a/eb/d2922ebd3cf2d3899fb80780d38f367197aadf 
b/eb/d2922ebd3cf2d3899fb80780d38f367197aadf
new file mode 100644
index 000..d50bf1d
--- /dev/null
+++ b/eb/d2922ebd3cf2d3899fb80780d38f367197aadf
@@ -0,0 +1 @@
+merged as: 0761f81643a6890457e9ef7d913ab5c88c2593a4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 57/55b4afdc62960831420a20782386fbc287460b

[Caolán McNamara]

 57/55b4afdc62960831420a20782386fbc287460b |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 9661ae9642bfd251c16059b141a162aa3db8cfbc
Author: Caolán McNamara 
Date:   Wed Jan 8 15:02:59 2014 +

Notes added by 'git notes add'

diff --git a/57/55b4afdc62960831420a20782386fbc287460b 
b/57/55b4afdc62960831420a20782386fbc287460b
new file mode 100644
index 000..efdec67
--- /dev/null
+++ b/57/55b4afdc62960831420a20782386fbc287460b
@@ -0,0 +1 @@
+prefer: 0761f81643a6890457e9ef7d913ab5c88c2593a4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 60924] move libraries to autoinstallation in scp2

[bugzilla-daemon]

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

--- Comment #64 from Marcos Souza  ---
(In reply to comment #63)
> (In reply to comment #62)
> > How we can do now?
> > 
> > Looking at scp2/source/ooo/file_library_ooo.scp we have some third party
> > libs like rasqal, raptor, lcms, opensll and others...
> > 
> > How we can handle these?
> 
> as a first step they can be changed from referencing the libraries directly
> to referencing Packages (like commit
> 6d9026f7a7ebad02b57fcd2dd15f66adeba361af )
> which gets rid of lots of #ifdefs already.

Done: https://gerrit.libreoffice.org/#/c/7311/

> 
> we could probably go a bit further and add something like auto-installed
> libraries also for packages, so that the packages are listed in Repository.mk
> with the scp2 package, just like libraries, but that requires some new
> functions in AutoInstall.mk.

This is a difficult task? I don't know the "make language" very well, but maybe
with code pointers I can make some progress :)

-- 
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] core.git: Branch 'libreoffice-4-2' - 2 commits - sfx2/source sfx2/uiconfig

[Caolán McNamara]

 sfx2/source/dialog/alienwarn.cxx|2 +-
 sfx2/uiconfig/ui/alienwarndialog.ui |   17 +
 2 files changed, 10 insertions(+), 9 deletions(-)

New commits:
commit f53eb46109cfef8b2b666add0bed63d46f5eb917
Author: Caolán McNamara 
Date:   Wed Jan 8 12:21:36 2014 +

swap button order in ui to match typical reality

This has no effect on the rendering of this .ui as native button ordering is
active. But it means that under the typical editing-under-GNOME that ones 
head
is wrecked from the cognitive impedance of the editor and viewer not 
matching
in order

Change-Id: Id4263f05bcecff72496f4cf0ae67345dc644
(cherry picked from commit bce7c9b0688c6f6f73311cc87ac094831489eedb)

diff --git a/sfx2/uiconfig/ui/alienwarndialog.ui 
b/sfx2/uiconfig/ui/alienwarndialog.ui
index 6513171..0e6141d 100644
--- a/sfx2/uiconfig/ui/alienwarndialog.ui
+++ b/sfx2/uiconfig/ui/alienwarndialog.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -23,14 +23,13 @@
 False
 end
 
-  
-_Use %FORMATNAME 
Format
+  
+Use _ODF 
Format
 True
 True
-True
-True
 True
 True
+bottom
   
   
 False
@@ -40,13 +39,14 @@
   
 
 
-  
-Use _ODF 
Format
+  
+_Use %FORMATNAME 
Format
 True
 True
+True
+True
 True
 True
-bottom
   
   
 False
@@ -82,8 +82,8 @@
   
 
 
-  save
   cancel
+  save
 
   
 
commit 99798298f98ae510efb3edc7d28f8149d281439f
Author: Caolán McNamara 
Date:   Wed Jan 8 12:14:04 2014 +

tweak button order for alien warn dialog

Change-Id: I6e51951df3bff0d1829bff8e2a436e4030247baf
(cherry picked from commit 2e8a1e1121bc23d442bf7be27e2ae6c15d101980)

diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx
index 0ec75af..ad5290e 100644
--- a/sfx2/source/dialog/alienwarn.cxx
+++ b/sfx2/source/dialog/alienwarn.cxx
@@ -28,7 +28,7 @@ SfxAlienWarningDialog::SfxAlienWarningDialog(Window* pParent, 
const OUString& _r
 : MessageDialog(pParent, "AlienWarnDialog", "sfx/ui/alienwarndialog.ui")
 {
 get(m_pWarningOnBox, "ask");
-get(m_pKeepCurrentBtn, "ok");
+get(m_pKeepCurrentBtn, "save");
 
 // replace formatname (text)
 OUString sInfoText = get_primary_text();
diff --git a/sfx2/uiconfig/ui/alienwarndialog.ui 
b/sfx2/uiconfig/ui/alienwarndialog.ui
index 5975d10..6513171 100644
--- a/sfx2/uiconfig/ui/alienwarndialog.ui
+++ b/sfx2/uiconfig/ui/alienwarndialog.ui
@@ -1,4 +1,5 @@
 
+
 
   
   
@@ -22,7 +23,7 @@
 False
 end
 
-  
+  
 _Use %FORMATNAME 
Format
 True
 True
@@ -81,7 +82,7 @@
   
 
 
-  ok
+  save
   cancel
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Glade UI Dialogs and UNO extensions

[Caolán McNamara]

On Tue, 2014-01-07 at 15:05 -0200, Olivier Hallot wrote:
> Hi
> 
> I have a demand to tweak some dialogs with better layout or widgets
> positions. In order to avoid disruption with the core development, I
> would like to know if these .ui dialogs can be packed into UNO extensions.

What you want to do is to effectively over-ride/replace existing .ui
files which isn't something I had considered doing at all. I have no
plans around that. 

I guess it wouldn't be impossible to e.g. in VclBuilder::VclBuilder
where the sUIDir, sUIFile and sID of the dialog are passed in to there
see if there any listeners to a hypothetical uiload event and ask them
if the want to provide a .ui for that case to use instead of the normal
one.

Or maybe some config settings to set some override dirs which would be
searched before the standard one to find the .ui. Obviously tweaking
things here would be necessarily very fragile. One could move elements,
hide them, change default buttons and those would generally work but
adding and removing stuff wouldn't generally work.

For the more normal case where extensions want to use the .ui for their
own dialogs I sort of plan to allow that once all the normal dialogs are
converted over and then make a careful glade catalog to describe the
awt-view of the uno-api widgets, figure out the existing translation
stuff for extension widgets and see what the right thing to do there is.

C.

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

Re: Glade UI Dialogs and UNO extensions

[Caolán McNamara]

On Tue, 2014-01-07 at 20:13 -0200, Olivier Hallot wrote:
> I have one (easy) situation, which I already sent to UI list, but no
> decision was made... It refers to the position of the default button in
> Save As dialog. In this dialog, the "keep as MS format" button is the
> default and is on the left. IMHO it should be on the right

In this particular case the "keep as MS" is equivalent to "ok"/"save"
and the "use ODF" is equivalent to "cancel" so should follow the
surrounding desktop rules for their placement. So for e.g. GNOME/MacOSX,
yes, "keep as MS" should be on the right. So I've fixed that now I
believe.

> "Save As ODF" should be emphasized.

Not so clear-cut IMO on which button should be the default. Personally I
feel that if I said "save as MS" and I get the confirmation dialog the
default should be "yes, what I asked you to do a second ago" and remain
"Save as M..." so I'll leave any decision on that to the UX list.

C.

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

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 4 commits - sw/source vcl/aqua vcl/inc vcl/source writerfilter/source

[Herbert Dürr]

 sw/source/core/doc/doclay.cxx |2 -
 vcl/aqua/source/gdi/salbmp.cxx|2 -
 vcl/aqua/source/gdi/salgdi.cxx|6 +--
 vcl/aqua/source/gdi/salnativewidgets.cxx  |6 +--
 vcl/aqua/source/window/salframe.cxx   |2 -
 vcl/inc/aqua/salgdi.h |   45 --
 vcl/source/control/menubtn.cxx|4 +-
 writerfilter/source/dmapper/GraphicImport.hxx |2 -
 8 files changed, 42 insertions(+), 27 deletions(-)

New commits:
commit 8209527470c4f327f8050d66b07ba46f206f44bd
Author: Herbert Dürr 
Date:   Wed Jan 8 13:57:53 2014 +

#i123895# make the Mac code 64bit clean regarding CGFloat/float mismatches

diff --git a/vcl/aqua/source/gdi/salbmp.cxx b/vcl/aqua/source/gdi/salbmp.cxx
index 834eeab..df7759d 100644
--- a/vcl/aqua/source/gdi/salbmp.cxx
+++ b/vcl/aqua/source/gdi/salbmp.cxx
@@ -772,7 +772,7 @@ CGImageRef AquaSalBitmap::CreateWithMask( const 
AquaSalBitmap& rMask,
 CFRelease( xMask );
 CGDataProviderRef xDataProvider( CGDataProviderCreateWithData( NULL,
 pMaskMem, nHeight * nMaskBytesPerRow, &CFRTLFree ) );
-static const float* pDecode = NULL;
+static const CGFloat* pDecode = NULL;
 xMask = CGImageMaskCreate( nWidth, nHeight, 8, 8, nMaskBytesPerRow, 
xDataProvider, pDecode, false );
 CFRelease( xDataProvider );
 CFRelease( xMaskContext );
diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx
index 6c4c933..672c33a 100644
--- a/vcl/aqua/source/gdi/salgdi.cxx
+++ b/vcl/aqua/source/gdi/salgdi.cxx
@@ -1368,7 +1368,7 @@ static void DrawPattern50( void*, CGContextRef rContext )
 
 void AquaSalGraphics::Pattern50Fill()
 {
-static const float aFillCol[4] = { 1,1,1,1 };
+static const CGFloat aFillCol[4] = { 1,1,1,1 };
 static const CGPatternCallbacks aCallback = { 0, &DrawPattern50, NULL };
 if( ! GetSalData()->mxP50Space )
 GetSalData()->mxP50Space = CGColorSpaceCreatePattern( 
GetSalData()->mxRGBSpace );
@@ -1392,7 +1392,7 @@ void AquaSalGraphics::invert( long nX, long nY, long 
nWidth, long nHeight, SalIn
 
 if ( nFlags & SAL_INVERT_TRACKFRAME )
 {
-const float dashLengths[2]  = { 4.0, 4.0 }; // for drawing 
dashed line
+const CGFloat dashLengths[2]  = { 4.0, 4.0 }; // for drawing 
dashed line
 CGContextSetBlendMode( mrContext, kCGBlendModeDifference );
 CGContextSetRGBStrokeColor ( mrContext, 1.0, 1.0, 1.0, 1.0 );
 CGContextSetLineDash ( mrContext, 0, dashLengths, 2 );
@@ -1429,7 +1429,7 @@ void AquaSalGraphics::invert( sal_uInt32 nPoints, const 
SalPoint* pPtAry, SalInv
 CGContextAddLines ( mrContext, CGpoints, nPoints );
 if ( nSalFlags & SAL_INVERT_TRACKFRAME )
 {
-const float dashLengths[2]  = { 4.0, 4.0 }; // for drawing 
dashed line
+const CGFloat dashLengths[2]  = { 4.0, 4.0 }; // for drawing 
dashed line
 CGContextSetBlendMode( mrContext, kCGBlendModeDifference );
 CGContextSetRGBStrokeColor ( mrContext, 1.0, 1.0, 1.0, 1.0 );
 CGContextSetLineDash ( mrContext, 0, dashLengths, 2 );
diff --git a/vcl/aqua/source/gdi/salnativewidgets.cxx 
b/vcl/aqua/source/gdi/salnativewidgets.cxx
index 63d9a72..f49e56b 100644
--- a/vcl/aqua/source/gdi/salnativewidgets.cxx
+++ b/vcl/aqua/source/gdi/salnativewidgets.cxx
@@ -710,11 +710,11 @@ sal_Bool AquaSalGraphics::drawNativeControl(ControlType 
nType,
 // Perhaps some other HIThemeButtonDrawInfo setting would do 
the trick ?
 
 CGContextSetShouldAntialias( mrContext, true );
-float aGrey[] = { 0.45, 0.45, 0.45, 1.0 };
+CGFloat aGrey[] = { 0.45, 0.45, 0.45, 1.0 };
 CGContextSetFillColor( mrContext, aGrey );
 CGContextBeginPath( mrContext );
-float x = rc.origin.x + rc.size.width;
-float y = rc.origin.y;
+CGFloat x = rc.origin.x + rc.size.width;
+CGFloat y = rc.origin.y;
 CGContextMoveToPoint( mrContext, x, y );
 y += rc.size.height;
 CGContextAddLineToPoint( mrContext, x, y );
diff --git a/vcl/aqua/source/window/salframe.cxx 
b/vcl/aqua/source/window/salframe.cxx
index 715a6fd..25d60be 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -1191,7 +1191,7 @@ static Color getColor( NSColor* pSysColor, const Color& 
rDefault, NSWindow* pWin
 NSColor* pRBGColor = [pSysColor colorUsingColorSpaceName: 
NSDeviceRGBColorSpace device: [pWin deviceDescription]];
 if( pRBGColor )
 {
-float r = 0, g = 0, b = 0, a = 0;
+CGFloat r = 0, g = 0, b = 0, a = 0;
 [pRBGColor getRed: &r green: &g blue: &b alpha: &a];
 aRet = Color( int(r*255.999), int(g*255.999), int(b*255

[Libreoffice-commits] core.git: 2 commits - include/vcl svtools/source vcl/source

[Matúš Kukan]

 include/vcl/svapp.hxx  |6 +++---
 svtools/source/uno/fpicker.cxx |   35 ---
 vcl/source/app/svapp.cxx   |   12 ++--
 3 files changed, 29 insertions(+), 24 deletions(-)

New commits:
commit df002e39f7518036ae1c1d2afec7a525ef902327
Author: Matúš Kukan 
Date:   Wed Jan 8 09:12:17 2014 +0100

These implementations could inherit from XInitialization too.

Change-Id: I70493afcec837411b0f3c6d5165564d2cc0996db

diff --git a/svtools/source/uno/fpicker.cxx b/svtools/source/uno/fpicker.cxx
index a9d06ad..7a4b769 100644
--- a/svtools/source/uno/fpicker.cxx
+++ b/svtools/source/uno/fpicker.cxx
@@ -20,7 +20,8 @@
 #include "sal/types.h"
 #include "rtl/ustring.hxx"
 
-#include "com/sun/star/lang/XMultiComponentFactory.hpp"
+#include 
+#include 
 
 #include "svtools/miscopt.hxx"
 #include "svl/pickerhistoryaccess.hxx"
@@ -57,7 +58,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * 
SAL_CALL
 com_sun_star_comp_svt_FilePicker_get_implementation(
 css::uno::XComponentContext *context, uno_Sequence * arguments)
 {
-assert(arguments != 0 && arguments->nElements == 0); (void) arguments;
+assert(arguments != 0);
 Reference< css::uno::XInterface > xResult;
 Reference< css::lang::XMultiComponentFactory > xFactory 
(context->getServiceManager());
 if (xFactory.is() && SvtMiscOptions().UseSystemFileDialog())
@@ -92,6 +93,14 @@ com_sun_star_comp_svt_FilePicker_get_implementation(
 // Add to FilePicker history.
 svt::addFilePicker (xResult);
 }
+css::uno::Reference< css::lang::XInitialization > xx(xResult, 
css::uno::UNO_QUERY);
+if (xx.is())
+{
+css::uno::Sequence aArgs(
+reinterpret_cast(arguments->elements),
+arguments->nElements);
+xx->initialize(aArgs);
+}
 xResult->acquire();
 return xResult.get();
 }
@@ -117,7 +126,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * 
SAL_CALL
 com_sun_star_comp_svt_FolderPicker_get_implementation(
 css::uno::XComponentContext *context, uno_Sequence * arguments)
 {
-assert(arguments != 0 && arguments->nElements == 0); (void) arguments;
+assert(arguments != 0);
 Reference< css::uno::XInterface > xResult;
 Reference< css::lang::XMultiComponentFactory > xFactory 
(context->getServiceManager());
 if (xFactory.is() && SvtMiscOptions().UseSystemFileDialog())
@@ -149,6 +158,14 @@ com_sun_star_comp_svt_FolderPicker_get_implementation(
 // Add to FolderPicker history.
 svt::addFolderPicker (xResult);
 }
+css::uno::Reference< css::lang::XInitialization > xx(xResult, 
css::uno::UNO_QUERY);
+if (xx.is())
+{
+css::uno::Sequence aArgs(
+reinterpret_cast(arguments->elements),
+arguments->nElements);
+xx->initialize(aArgs);
+}
 xResult->acquire();
 return xResult.get();
 }
commit 194bdbde25dd70988c94ff5e1af43b530d47d94b
Author: Matúš Kukan 
Date:   Wed Jan 8 09:08:08 2014 +0100

Revert "make FilePicker::createWithMode not crash"

This reverts commit 58ea27124af27bfac21a796b0d13d72354bd0dd3.
It's probably better to fix it another way.

diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 57814e0..1620efa 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -389,9 +389,9 @@ public:
 /** Create a platform specific file picker, if one is available,
 otherwise return an empty reference
 */
-static css::uno::Reference
-createFilePicker(const css::uno::Sequence& rArguments,
- const 
css::uno::Reference& rServiceManager);
+static com::sun::star::uno::Reference< 
com::sun::star::ui::dialogs::XFilePicker2 >
+createFilePicker( const com::sun::star::uno::Reference<
+  com::sun::star::uno::XComponentContext >& 
rServiceManager );
 
 /** Create a platform specific folder picker, if one is available,
 otherwise return an empty reference
diff --git a/svtools/source/uno/fpicker.cxx b/svtools/source/uno/fpicker.cxx
index 1034baf..a9d06ad 100644
--- a/svtools/source/uno/fpicker.cxx
+++ b/svtools/source/uno/fpicker.cxx
@@ -57,22 +57,19 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * 
SAL_CALL
 com_sun_star_comp_svt_FilePicker_get_implementation(
 css::uno::XComponentContext *context, uno_Sequence * arguments)
 {
-assert(arguments != 0 && (arguments->nElements == 0 || 
arguments->nElements == 1));
-css::uno::Sequence aArgs(reinterpret_cast(arguments->elements),
-arguments->nElements);
+assert(arguments != 0 && arguments->nElements == 0); (void) arguments;
 Reference< css::uno::XInterface > xResult;
 Reference< css::lang::XMultiComponentFactory > xFactory 
(context->getServiceManager());
 if (xFactory.is() && SvtMiscOptions().UseSystemFileDialog())
 {
-xResult = 
Reference(Application::createFilePicker(aArg

[Libreoffice-commits] core.git: 5 commits - sfx2/source sfx2/uiconfig svx/source svx/uiconfig vcl/source

[Caolán McNamara]

 sfx2/source/dialog/alienwarn.cxx|2 +-
 sfx2/uiconfig/ui/alienwarndialog.ui |   17 +
 svx/source/dialog/graphctl.cxx  |   19 +--
 svx/uiconfig/ui/sidebarpossize.ui   |2 +-
 vcl/source/window/builder.cxx   |   12 +++-
 5 files changed, 27 insertions(+), 25 deletions(-)

New commits:
commit daa654fb44772009017b0c918903093147df1620
Author: Caolán McNamara 
Date:   Wed Jan 8 13:30:06 2014 +

GtkComboBox->VclComboBoxNumeric

Change-Id: Iba1416692a619c1f566f26da5b06ed04342057b3

diff --git a/svx/uiconfig/ui/sidebarpossize.ui 
b/svx/uiconfig/ui/sidebarpossize.ui
index e0aa74b..c135e5c 100644
--- a/svx/uiconfig/ui/sidebarpossize.ui
+++ b/svx/uiconfig/ui/sidebarpossize.ui
@@ -234,7 +234,7 @@
 vertical
 6
 
-  
+  
 True
 False
 True
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 0d4ca57..5aac570 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1351,14 +1351,14 @@ Window *VclBuilder::makeObject(Window *pParent, const 
OString &name, const OStri
 
 if (!sPattern.isEmpty())
 {
+connectNumericFormatterAdjustment(id, sAdjustment);
 OString sUnit = extractUnit(sPattern);
 FieldUnit eUnit = detectMetricUnit(sUnit);
 SAL_INFO("vcl.layout", "making metric box for " << name.getStr() 
<< " " << sUnit.getStr());
-connectNumericFormatterAdjustment(id, sAdjustment);
-MetricBox *pBox = new MetricBox(pParent, nBits|WB_BORDER);
-if (bDropdown)
-pBox->EnableAutoSize(true);
+MetricBox *pBox = new MetricBox(pParent, nBits);
+pBox->EnableAutoSize(true);
 pBox->SetUnit(eUnit);
+pBox->SetDecimalDigits(extractDecimalDigits(sPattern));
 if (eUnit == FUNIT_CUSTOM)
 pBox->SetCustomUnitText(OStringToOUString(sUnit, 
RTL_TEXTENCODING_UTF8));
 pWindow = pBox;
commit ef683ad85210455e64e9472161c91407fe173ddf
Author: Caolán McNamara 
Date:   Wed Jan 8 13:25:24 2014 +

improve warning message

Change-Id: I2d8aab3f4589750aecb0a9565c595a712fc7bc73

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 6b4cce4..0d4ca57 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1295,7 +1295,9 @@ Window *VclBuilder::makeObject(Window *pParent, const 
OString &name, const OStri
 connectNumericFormatterAdjustment(id, sAdjustment);
 OString sUnit = extractUnit(sPattern);
 FieldUnit eUnit = detectMetricUnit(sUnit);
-SAL_WARN("vcl.layout", "making metric box for " << name.getStr() 
<< " " << sUnit.getStr()
+SAL_WARN("vcl.layout", "making metric box for type: " << 
name.getStr()
+<< " unit: " << sUnit.getStr()
+<< " name: " << id.getStr()
 << " use a VclComboBoxNumeric instead");
 MetricBox *pBox = new MetricBox(pParent, nBits);
 pBox->EnableAutoSize(true);
commit bce7c9b0688c6f6f73311cc87ac094831489eedb
Author: Caolán McNamara 
Date:   Wed Jan 8 12:21:36 2014 +

swap button order in ui to match typical reality

This has no effect on the rendering of this .ui as native button ordering is
active. But it means that under the typical editing-under-GNOME that ones 
head
is wrecked from the cognitive impedance of the editor and viewer not 
matching
in order

Change-Id: Id4263f05bcecff72496f4cf0ae67345dc644

diff --git a/sfx2/uiconfig/ui/alienwarndialog.ui 
b/sfx2/uiconfig/ui/alienwarndialog.ui
index 6513171..0e6141d 100644
--- a/sfx2/uiconfig/ui/alienwarndialog.ui
+++ b/sfx2/uiconfig/ui/alienwarndialog.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -23,14 +23,13 @@
 False
 end
 
-  
-_Use %FORMATNAME 
Format
+  
+Use _ODF 
Format
 True
 True
-True
-True
 True
 True
+bottom
   
   
 False
@@ -40,13 +39,14 @@
   
 
 
-  
-Use _ODF 
Format
+  
+_Use %FORMATNAME 
Format
 True
 True
+True
+True
 True
 True
-bottom
   
   
 False
@@ -82,8 +82,8 @@
   
 
 
-  save
   cancel
+  save
 
   
 
commit 2e8a1e1121bc23d442bf7be27e2ae6c15d101980
Author: Caolán McNamara 
Date:   Wed Jan 8 12:14:04 2014 +

tweak button order for

[Libreoffice-commits] core.git: svtools/source svtools/util

[Matúš Kukan]

 svtools/source/hatchwindow/documentcloser.cxx |   78 +---
 svtools/source/inc/documentcloser.hxx |   82 --
 svtools/source/uno/miscservices.cxx   |8 --
 svtools/util/svt.component|3 
 4 files changed, 56 insertions(+), 115 deletions(-)

New commits:
commit ceffe83515be125df6c3811760ec59b95942a978
Author: Matúš Kukan 
Date:   Mon Dec 23 10:27:49 2013 +0100

svt: Use constructor feature for ODocumentCloser.

Change-Id: Ia1a9593e3d1dbc41cf25f6a983cb340f48538226
Signed-off-by: Stephan Bergmann 

diff --git a/svtools/source/hatchwindow/documentcloser.cxx 
b/svtools/source/hatchwindow/documentcloser.cxx
index 9bd1746..1e198da 100644
--- a/svtools/source/hatchwindow/documentcloser.cxx
+++ b/svtools/source/hatchwindow/documentcloser.cxx
@@ -17,29 +17,63 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
 #include 
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 #include 
+#include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
 
-#include "documentcloser.hxx"
-
 using namespace ::com::sun::star;
 
+namespace {
 
-// 
-// MainThreadFrameCloserRequest
-// 
+// the service is implemented as a wrapper to be able to die by refcount
+// the disposing mechanics is required for java related scenarios
+class ODocumentCloser : public ::cppu::WeakImplHelper3< 
::com::sun::star::lang::XComponent,
+
::com::sun::star::lang::XInitialization,
+
::com::sun::star::lang::XServiceInfo >
+{
+::osl::Mutex m_aMutex;
+::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > 
m_xFrame;
+::cppu::OInterfaceContainerHelper* m_pListenersContainer; // list of 
listeners
+
+sal_Bool m_bDisposed;
+sal_Bool m_bInitialized;
+
+public:
+ODocumentCloser();
+~ODocumentCloser();
+
+// XComponent
+virtual void SAL_CALL dispose() throw 
(::com::sun::star::uno::RuntimeException);
+virtual void SAL_CALL addEventListener( const 
::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& 
xListener ) throw (::com::sun::star::uno::RuntimeException);
+virtual void SAL_CALL removeEventListener( const 
::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& 
aListener ) throw (::com::sun::star::uno::RuntimeException);
+
+// XInitialization
+virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< 
::com::sun::star::uno::Any >& aArguments ) throw 
(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+
+// XServiceInfo
+virtual OUString SAL_CALL getImplementationName(  ) throw 
(::com::sun::star::uno::RuntimeException);
+virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) 
throw (::com::sun::star::uno::RuntimeException);
+virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL 
getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
+};
 
 class MainThreadFrameCloserRequest
 {
@@ -124,9 +158,8 @@ IMPL_STATIC_LINK( MainThreadFrameCloserRequest, worker, 
MainThreadFrameCloserReq
 // 
 
 // 
-ODocumentCloser::ODocumentCloser( const uno::Reference< uno::XComponentContext 
>& xContext )
-: m_xContext( xContext )
-, m_pListenersContainer( NULL )
+ODocumentCloser::ODocumentCloser()
+: m_pListenersContainer( NULL )
 , m_bDisposed( sal_False )
 , m_bInitialized( sal_False )
 {
@@ -225,7 +258,7 @@ void SAL_CALL ODocumentCloser::initialize( const 
uno::Sequence< uno::Any >& aArg
 OUString SAL_CALL ODocumentCloser::getImplementationName(  )
 throw (uno::RuntimeException)
 {
-return impl_staticGetImplementationName();
+return OUString( "com.sun.star.comp.embed.DocumentCloser" );
 }
 
 ::sal_Bool SAL_CALL ODocumentCloser::supportsService( const OUString& 
ServiceName )
@@ -237,28 +270,25 @@ OUString SAL_CALL ODocumentCloser::getImplementationName( 
 )
 uno::Sequence< OUString > SAL_CALL ODocumentCloser::getSupportedServiceNames()
 throw (uno::RuntimeException)
 {
-return impl_staticGetSupportedServiceNames();
-}
-
-// Static methods
-uno::Sequence< OUString > SAL_CALL 
ODocumentCloser::impl_staticGetSupportedServiceNames()
-{
 const OUString aServiceName( "com.sun.star.embed.DocumentCloser" );
 return uno::Sequence< OUString >( &aServiceName, 1 );
 }
 
-OUString SAL_CALL ODocumentCloser::impl_staticGetImplementationName()
-{
-return OUString( "com.sun.star.comp.embed.DocumentCloser" );
 }
 
-// -

[Libreoffice-commits] core.git: 2 commits - chart2/inc chart2/source include/svx sc/inc sc/source sd/inc sd/source svx/source sw/inc sw/source

[Matúš Kukan]

 chart2/inc/pch/precompiled_chartcontroller.hxx|1 
 chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx |7 
 include/svx/unoshcol.hxx  |   89 
--
 sc/inc/pch/precompiled_sc.hxx |1 
 sc/source/ui/Accessibility/AccessibleDocument.cxx |9 -
 sc/source/ui/unoobj/viewuno.cxx   |   10 -
 sd/inc/pch/precompiled_sd.hxx |1 
 sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx |9 -
 sd/source/ui/unoidl/SdUnoDrawView.cxx |6 
 svx/source/unodraw/unoshcol.cxx   |   78 
++--
 sw/inc/pch/precompiled_sw.hxx |1 
 sw/source/ui/uno/unotxvw.cxx  |6 
 12 files changed, 88 insertions(+), 130 deletions(-)

New commits:
commit 0196a81910753f3d14add062b83a03ca83ca9e0b
Author: Matúš Kukan 
Date:   Wed Jan 8 14:16:58 2014 +0100

SvxShapeCollection is not used directly anymore; hide it.

Change-Id: I81c62c0a3ed880c0523e6ae54a27da56ff5acdca

diff --git a/include/svx/unoshcol.hxx b/include/svx/unoshcol.hxx
deleted file mode 100644
index f0e85f7..000
--- a/include/svx/unoshcol.hxx
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_SVX_UNOSHCOL_HXX
-#define INCLUDED_SVX_UNOSHCOL_HXX
-
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-
-class SvxShapeCollectionMutex
-{
-public:
-::osl::Mutex maMutex;
-};
-
-/***
-*  *
-***/
-class SVX_DLLPUBLIC SvxShapeCollection :public ::cppu::WeakAggImplHelper3<
-::com::sun::star::drawing::XShapes,
-
::com::sun::star::lang::XServiceInfo,
-::com::sun::star::lang::XComponent
->,
-public SvxShapeCollectionMutex
-{
-private:
-cppu::OInterfaceContainerHelper maShapeContainer;
-
-cppu::OBroadcastHelper mrBHelper;
-
-SVX_DLLPRIVATE virtual void disposing() throw();
-
-public:
-SvxShapeCollection() throw();
-virtual ~SvxShapeCollection() throw();
-
-// XInterface
-virtual void SAL_CALL release() throw();
-
-// XComponent
-virtual void SAL_CALL dispose() 
throw(::com::sun::star::uno::RuntimeException);
-virtual void SAL_CALL addEventListener( const 
::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& 
aListener ) throw(::com::sun::star::uno::RuntimeException);
-virtual void SAL_CALL removeEventListener( const 
::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& 
aListener ) throw(::com::sun::star::uno::RuntimeException);
-
-// XIndexAccess
-virtual sal_Int32 SAL_CALL getCount() 
throw(::com::sun::star::uno::RuntimeException) ;
-virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) 
throw(::com::sun::star::lang::IndexOutOfBoundsException, 
::com::sun::star::lang::WrappedTargetException, 
::com::sun::star::uno::RuntimeException);
-
-// XElementAccess
-virtual ::com::sun::star::uno::Type SAL_CALL getElementType() 
throw(::com::sun::star::uno::RuntimeException);
-virtual sal_Bool SAL_CALL hasElements() 
throw(::com::sun::star::uno::RuntimeException);
-
-// XShapes
-virtual void SAL_CALL add( const ::com::sun::star::uno::Reference< 
::com::sun::star::drawing::XShape >& xShape ) 
throw(::com::sun::star::uno::RuntimeException);
-virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< 
::com::sun::star::drawing::XShape >& xShape ) 
throw(::com::sun::star::uno::RuntimeException);
-
-// XServiceInfo
-virtual OUString SAL_CAL

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source

[Kohei Yoshida]

 sc/source/core/data/dpobject.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 9b0c7cd38c565e7fcdd0b426391749a59d57038f
Author: Kohei Yoshida 
Date:   Tue Jan 7 16:36:55 2014 -0500

fdo#72774: Ensure that all the group fields are in cache upon file load.

This resolves the originally reported issue in that bug (in Comment 1).

Change-Id: I6fb85cff1eafb78d784605aa08e7d992a1ac36e0
(cherry picked from commit 256e4ccba8a331f2d30c6b5da9dca70206deadae)
Reviewed-on: https://gerrit.libreoffice.org/7301
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index bde3156..eb4dad2 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -2858,6 +2858,9 @@ const ScDPCache* 
ScDPCollection::SheetCaches::getCache(const ScRange& rRange, co
 return NULL;
 }
 
+if (pDimData)
+pDimData->WriteToCache(*itCache->second);
+
 return itCache->second;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/dputil.hxx |2 +-
 sc/source/core/data/dpdimsave.cxx |4 ++--
 sc/source/core/data/dpgroup.cxx   |2 +-
 sc/source/core/data/dputil.cxx|   13 -
 4 files changed, 12 insertions(+), 9 deletions(-)

New commits:
commit 06a5bad8e1feb1972059d4f9c4d89eb59ae43ae2
Author: Kohei Yoshida 
Date:   Tue Jan 7 22:13:07 2014 -0500

fdo#72774: Generate correct group items for the year group.

This changes bring it back to the same algorithm used in 3.5.

Change-Id: I16855cef1de133a1f886baa823d5b0d2b148e781
(cherry picked from commit c2e88a32314012afb799e321ec1d658f99f71781)
Reviewed-on: https://gerrit.libreoffice.org/7305
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/inc/dputil.hxx b/sc/inc/dputil.hxx
index e4ed831..9568e95 100644
--- a/sc/inc/dputil.hxx
+++ b/sc/inc/dputil.hxx
@@ -45,7 +45,7 @@ public:
 SvNumberFormatter* pFormatter);
 
 static sal_Int32 getDatePartValue(
-double fValue, const ScDPNumGroupInfo& rInfo, sal_Int32 nDatePart,
+double fValue, const ScDPNumGroupInfo* pInfo, sal_Int32 nDatePart,
 SvNumberFormatter* pFormatter);
 
 static OUString getDisplayedMeasureName(const OUString& rName, 
ScSubTotalFunc eFunc);
diff --git a/sc/source/core/data/dpdimsave.cxx 
b/sc/source/core/data/dpdimsave.cxx
index d200971..3f51268 100644
--- a/sc/source/core/data/dpdimsave.cxx
+++ b/sc/source/core/data/dpdimsave.cxx
@@ -337,8 +337,8 @@ void fillDateGroupDimension(
 {
 case sheet::DataPilotFieldGroupBy::YEARS:
 nStart = ScDPUtil::getDatePartValue(
-fSourceMin, rDateInfo, sheet::DataPilotFieldGroupBy::YEARS, 
pFormatter);
-nEnd = ScDPUtil::getDatePartValue(fSourceMax, rDateInfo, 
sheet::DataPilotFieldGroupBy::YEARS, pFormatter);
+fSourceMin, NULL, sheet::DataPilotFieldGroupBy::YEARS, 
pFormatter);
+nEnd = ScDPUtil::getDatePartValue(fSourceMax, NULL, 
sheet::DataPilotFieldGroupBy::YEARS, pFormatter);
 break;
 case sheet::DataPilotFieldGroupBy::QUARTERS: nStart = 1; nEnd = 4;   
break;
 case sheet::DataPilotFieldGroupBy::MONTHS:   nStart = 1; nEnd = 12;  
break;
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index f79a740..e5da799 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -911,7 +911,7 @@ void ScDPGroupTableData::FillGroupValues(vector& 
rItems, const vectorGetFormatTable();
 sal_Int32 nPartValue = ScDPUtil::getDatePartValue(
-pData->GetValue(), *pNumInfo, nDatePart, pFormatter);
+pData->GetValue(), pNumInfo, nDatePart, pFormatter);
 
 ScDPItemData aItem(nDatePart, nPartValue);
 rItems[i] = pCache->GetIdByItemData(nColumn, aItem);
diff --git a/sc/source/core/data/dputil.cxx b/sc/source/core/data/dputil.cxx
index e21b2a8..03f585c 100644
--- a/sc/source/core/data/dputil.cxx
+++ b/sc/source/core/data/dputil.cxx
@@ -290,16 +290,19 @@ OUString ScDPUtil::getNumGroupName(
 }
 
 sal_Int32 ScDPUtil::getDatePartValue(
-double fValue, const ScDPNumGroupInfo& rInfo, sal_Int32 nDatePart,
+double fValue, const ScDPNumGroupInfo* pInfo, sal_Int32 nDatePart,
 SvNumberFormatter* pFormatter)
 {
 // Start and end are inclusive
 // (End date without a time value is included, with a time value it's not)
 
-if (fValue < rInfo.mfStart && !rtl::math::approxEqual(fValue, 
rInfo.mfStart))
-return ScDPItemData::DateFirst;
-if (fValue > rInfo.mfEnd && !rtl::math::approxEqual(fValue, rInfo.mfEnd))
-return ScDPItemData::DateLast;
+if (pInfo)
+{
+if (fValue < pInfo->mfStart && !rtl::math::approxEqual(fValue, 
pInfo->mfStart))
+return ScDPItemData::DateFirst;
+if (fValue > pInfo->mfEnd && !rtl::math::approxEqual(fValue, 
pInfo->mfEnd))
+return ScDPItemData::DateLast;
+}
 
 sal_Int32 nResult = 0;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/tml/crack-1' - ios/experimental

[Tor Lillqvist]

 ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5d9cba66327e0637166d53885512bf8234156fb4
Author: Tor Lillqvist 
Date:   Wed Jan 8 15:20:18 2014 +0200

Need to reference svx_component_getFactory, too, to be comparable, says 
matus

Change-Id: I6e57184c25e4c8abcf74a2fb0536ec553148d756

diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
index 5a3707b..2457d9e 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
@@ -114,6 +114,7 @@ lo_get_libmap(void)
 { "libstocserviceslo.a", stocservices_component_getFactory },
 { "libsvllo.a", svl_component_getFactory },
 { "libsvtlo.a", svt_component_getFactory },
+{ "libsvxlo.a", svx_component_getFactory },
 { "libsvxcorelo.a", svxcore_component_getFactory },
 { "libswdlo.a", swd_component_getFactory },
 { "libswlo.a", sw_component_getFactory },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Google Summer of Code 2014

[Cedric Bosdonnat]

Hi Tommy,

On Wed, 2014-01-08 at 13:30 +0100, Tommy wrote:
> On Wed, 08 Jan 2014 11:05:12 +0100, Fridrich Strba  
>  wrote:
> 
> > Friends,
> >
> > Just to keep you updated that the organization applications for the
> > Google Summer of Code 2014 will start the Monday after FOSDEM[1].
> >
> > 
> >
> > Cheers
> >
> > Fridrich
> >
> > [1]
> > http://www.google-melange.com/gsoc/document/show/gsoc_program/google/gsoc2014/help_page#2._What_is_the_program_timeline
> > [2] https://wiki.documentfoundation.org/Development/Gsoc/Ideas
> 
> is there a page with the list of previous GSoC completed tasks by year?

Not really, you would need to dig in the blog posts from Fridrich,
Thorsten and myself to find out the wrap up posts.

--
Cedric

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/dputil.hxx |2 +-
 sc/source/core/data/dpdimsave.cxx |4 ++--
 sc/source/core/data/dpgroup.cxx   |2 +-
 sc/source/core/data/dputil.cxx|   13 -
 4 files changed, 12 insertions(+), 9 deletions(-)

New commits:
commit 584b8621afec7a77ceab2e2f029687a7dd1a18c3
Author: Kohei Yoshida 
Date:   Tue Jan 7 22:13:07 2014 -0500

fdo#72774: Generate correct group items for the year group.

This changes bring it back to the same algorithm used in 3.5.

Change-Id: I16855cef1de133a1f886baa823d5b0d2b148e781
(cherry picked from commit c2e88a32314012afb799e321ec1d658f99f71781)
Reviewed-on: https://gerrit.libreoffice.org/7306
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/inc/dputil.hxx b/sc/inc/dputil.hxx
index e4ed831..9568e95 100644
--- a/sc/inc/dputil.hxx
+++ b/sc/inc/dputil.hxx
@@ -45,7 +45,7 @@ public:
 SvNumberFormatter* pFormatter);
 
 static sal_Int32 getDatePartValue(
-double fValue, const ScDPNumGroupInfo& rInfo, sal_Int32 nDatePart,
+double fValue, const ScDPNumGroupInfo* pInfo, sal_Int32 nDatePart,
 SvNumberFormatter* pFormatter);
 
 static OUString getDisplayedMeasureName(const OUString& rName, 
ScSubTotalFunc eFunc);
diff --git a/sc/source/core/data/dpdimsave.cxx 
b/sc/source/core/data/dpdimsave.cxx
index 16f68b8..2db4023 100644
--- a/sc/source/core/data/dpdimsave.cxx
+++ b/sc/source/core/data/dpdimsave.cxx
@@ -338,8 +338,8 @@ void fillDateGroupDimension(
 {
 case sheet::DataPilotFieldGroupBy::YEARS:
 nStart = ScDPUtil::getDatePartValue(
-fSourceMin, rDateInfo, sheet::DataPilotFieldGroupBy::YEARS, 
pFormatter);
-nEnd = ScDPUtil::getDatePartValue(fSourceMax, rDateInfo, 
sheet::DataPilotFieldGroupBy::YEARS, pFormatter);
+fSourceMin, NULL, sheet::DataPilotFieldGroupBy::YEARS, 
pFormatter);
+nEnd = ScDPUtil::getDatePartValue(fSourceMax, NULL, 
sheet::DataPilotFieldGroupBy::YEARS, pFormatter);
 break;
 case sheet::DataPilotFieldGroupBy::QUARTERS: nStart = 1; nEnd = 4;   
break;
 case sheet::DataPilotFieldGroupBy::MONTHS:   nStart = 1; nEnd = 12;  
break;
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index 1e8059a..6a9f824 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -911,7 +911,7 @@ void ScDPGroupTableData::FillGroupValues(vector& 
rItems, const vectorGetFormatTable();
 sal_Int32 nPartValue = ScDPUtil::getDatePartValue(
-pData->GetValue(), *pNumInfo, nDatePart, pFormatter);
+pData->GetValue(), pNumInfo, nDatePart, pFormatter);
 
 ScDPItemData aItem(nDatePart, nPartValue);
 rItems[i] = pCache->GetIdByItemData(nColumn, aItem);
diff --git a/sc/source/core/data/dputil.cxx b/sc/source/core/data/dputil.cxx
index e34bc79..558e189 100644
--- a/sc/source/core/data/dputil.cxx
+++ b/sc/source/core/data/dputil.cxx
@@ -294,16 +294,19 @@ OUString ScDPUtil::getNumGroupName(
 }
 
 sal_Int32 ScDPUtil::getDatePartValue(
-double fValue, const ScDPNumGroupInfo& rInfo, sal_Int32 nDatePart,
+double fValue, const ScDPNumGroupInfo* pInfo, sal_Int32 nDatePart,
 SvNumberFormatter* pFormatter)
 {
 // Start and end are inclusive
 // (End date without a time value is included, with a time value it's not)
 
-if (fValue < rInfo.mfStart && !rtl::math::approxEqual(fValue, 
rInfo.mfStart))
-return ScDPItemData::DateFirst;
-if (fValue > rInfo.mfEnd && !rtl::math::approxEqual(fValue, rInfo.mfEnd))
-return ScDPItemData::DateLast;
+if (pInfo)
+{
+if (fValue < pInfo->mfStart && !rtl::math::approxEqual(fValue, 
pInfo->mfStart))
+return ScDPItemData::DateFirst;
+if (fValue > pInfo->mfEnd && !rtl::math::approxEqual(fValue, 
pInfo->mfEnd))
+return ScDPItemData::DateLast;
+}
 
 sal_Int32 nResult = 0;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/source

[Kohei Yoshida]

 sc/source/core/data/dpobject.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit d391dd145631ffdbc6e506ba59db7d1977331aff
Author: Kohei Yoshida 
Date:   Tue Jan 7 16:36:55 2014 -0500

fdo#72774: Ensure that all the group fields are in cache upon file load.

This resolves the originally reported issue in that bug (in Comment 1).

Change-Id: I6fb85cff1eafb78d784605aa08e7d992a1ac36e0
(cherry picked from commit 256e4ccba8a331f2d30c6b5da9dca70206deadae)
Reviewed-on: https://gerrit.libreoffice.org/7302
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index f9344aa..3ade4cf 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -2858,6 +2858,9 @@ const ScDPCache* 
ScDPCollection::SheetCaches::getCache(const ScRange& rRange, co
 return NULL;
 }
 
+if (pDimData)
+pDimData->WriteToCache(*itCache->second);
+
 return itCache->second;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Failing slowcheck in openSUSE build of 4.2.0.1

[Tomáš Chvátal]

2014/1/8 Tomáš Chvátal 
>
>
>
>> Also, do you have the required fonts in the chroot so that the tests can
>> actually pass?
>>
>
> Hmm might be it, will add them and see results in couple of hours :P
>
> Was the missing fonts. The build with the fonts around passed just fine.

Thanks for help

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/source

[Kohei Yoshida]

 sc/source/core/data/dpobject.cxx|   12 +++-
 sc/source/core/data/dpresfilter.cxx |   29 +
 2 files changed, 28 insertions(+), 13 deletions(-)

New commits:
commit 7c4a58833df3931c168c57be3239e904e3a3baba
Author: Kohei Yoshida 
Date:   Tue Jan 7 00:48:10 2014 -0500

fdo#72645: Case-insensitive string comparison in GETPIVOTDATA.

Change-Id: Ibdb2b7ab2bae03875a3462816e860f58d9076457
Reviewed-on: https://gerrit.libreoffice.org/7285
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 3d9f5af..f9344aa 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -1321,24 +1321,24 @@ namespace {
 
 class FindByName : std::unary_function
 {
-OUString maName;
+OUString maName; // must be all uppercase.
 public:
 FindByName(const OUString& rName) : maName(rName) {}
 bool operator() (const ScDPSaveDimension* pDim) const
 {
 // Layout name takes precedence.
 const OUString* pLayoutName = pDim->GetLayoutName();
-if (pLayoutName && *pLayoutName == maName)
+if (pLayoutName && ScGlobal::pCharClass->uppercase(*pLayoutName) == 
maName)
 return true;
 
 sheet::GeneralFunction eGenFunc = 
static_cast(pDim->GetFunction());
 ScSubTotalFunc eFunc = ScDPUtil::toSubTotalFunc(eGenFunc);
 OUString aSrcName = ScDPUtil::getSourceDimensionName(pDim->GetName());
 OUString aFuncName = ScDPUtil::getDisplayedMeasureName(aSrcName, 
eFunc);
-if (maName == aFuncName)
+if (maName == ScGlobal::pCharClass->uppercase(aFuncName))
 return true;
 
-return maName == aSrcName;
+return maName == ScGlobal::pCharClass->uppercase(aSrcName);
 }
 };
 
@@ -1382,7 +1382,9 @@ double ScDPObject::GetPivotData(const OUString& 
rDataFieldName, std::vector::iterator it = std::find_if(
-aDataDims.begin(), aDataDims.end(), FindByName(rDataFieldName));
+aDataDims.begin(), aDataDims.end(),
+FindByName(ScGlobal::pCharClass->uppercase(rDataFieldName)));
+
 if (it == aDataDims.end())
 return fRet;
 
diff --git a/sc/source/core/data/dpresfilter.cxx 
b/sc/source/core/data/dpresfilter.cxx
index 41b2d7e..d4895b8 100644
--- a/sc/source/core/data/dpresfilter.cxx
+++ b/sc/source/core/data/dpresfilter.cxx
@@ -10,6 +10,7 @@
 #include "dpresfilter.hxx"
 #include "global.hxx"
 
+#include 
 #include 
 
 #include 
@@ -113,12 +114,13 @@ void ScDPResultTree::add(
 
 // See if this dimension exists.
 DimensionsType& rDims = pMemNode->maChildDimensions;
-DimensionsType::iterator itDim = rDims.find(filter.maDimName);
+OUString aUpperName = 
ScGlobal::pCharClass->uppercase(filter.maDimName);
+DimensionsType::iterator itDim = rDims.find(aUpperName);
 if (itDim == rDims.end())
 {
 // New dimenison.  Insert it.
 std::pair r =
-rDims.insert(DimensionsType::value_type(filter.maDimName, new 
DimensionNode(pMemNode)));
+rDims.insert(DimensionsType::value_type(aUpperName, new 
DimensionNode(pMemNode)));
 
 if (!r.second)
 // Insertion failed!
@@ -132,13 +134,14 @@ void ScDPResultTree::add(
 // Now, see if this dimension member exists.
 DimensionNode* pDim = itDim->second;
 MembersType& rMembers = pDim->maChildMembers;
-MembersType::iterator itMem = rMembers.find(filter.maValue);
+aUpperName = ScGlobal::pCharClass->uppercase(filter.maValue);
+MembersType::iterator itMem = rMembers.find(aUpperName);
 if (itMem == rMembers.end())
 {
 // New member.  Insert it.
 std::pair r =
 rMembers.insert(
-MembersType::value_type(filter.maValue, new 
MemberNode(pDim)));
+MembersType::value_type(aUpperName, new MemberNode(pDim)));
 
 if (!r.second)
 // Insertion failed!
@@ -153,7 +156,10 @@ void ScDPResultTree::add(
 
 if (pDimName && pMemName)
 {
-NamePairType aNames(*pDimName, *pMemName);
+NamePairType aNames(
+ScGlobal::pCharClass->uppercase(*pDimName),
+ScGlobal::pCharClass->uppercase(*pMemName));
+
 LeafValuesType::iterator it = maLeafValues.find(aNames);
 if (it == maLeafValues.end())
 {
@@ -197,13 +203,17 @@ const ScDPResultTree::ValuesType* 
ScDPResultTree::getResults(
 const MemberNode* pMember = mpRoot;
 for (; p != pEnd; ++p)
 {
-DimensionsType::const_iterator itDim = 
pMember->maChildDimensions.find(p->FieldName);
+DimensionsType::const_iterator itDim = pMember->maChildDimensions.find(
+ScGlobal::pCharClass->uppercase(p->FieldName));
+
 if (itDim == pMember->maChildDimensions.end())
 // Specified dimension not found.

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/dpresfilter.hxx  |   12 +
 sc/source/core/data/dpobject.cxx|4 +--
 sc/source/core/data/dpresfilter.cxx |   44 
 sc/source/core/data/dptabsrc.cxx|   28 +-
 4 files changed, 79 insertions(+), 9 deletions(-)

New commits:
commit 83eb0b64980b405bc94ed19f3bcb60860f86e7d4
Author: Kohei Yoshida 
Date:   Mon Jan 6 23:45:46 2014 -0500

fdo#72645: Allow GETPIVOTDATA to get result from leaf node of result tree.

Change-Id: I0fc1fd069440ed6fee378fc2dfd2ed761afbdeab
Reviewed-on: https://gerrit.libreoffice.org/7284
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/inc/dpresfilter.hxx b/sc/inc/dpresfilter.hxx
index be84b8c..bc7ffc1 100644
--- a/sc/inc/dpresfilter.hxx
+++ b/sc/inc/dpresfilter.hxx
@@ -15,6 +15,7 @@
 #include 
 #include 
 #include 
+#include 
 
 
 namespace com { namespace sun { namespace star { namespace sheet {
@@ -85,6 +86,15 @@ private:
 #endif
 };
 
+typedef std::pair NamePairType;
+
+struct NamePairHash
+{
+size_t operator() (const NamePairType& rPair) const;
+};
+typedef boost::unordered_map 
LeafValuesType;
+LeafValuesType maLeafValues;
+
 OUString maPrimaryDimName;
 MemberNode* mpRoot;
 
@@ -115,6 +125,8 @@ public:
 const com::sun::star::uno::Sequence<
 com::sun::star::sheet::DataPilotFieldFilter>& rFilters) const;
 
+double getLeafResult(const com::sun::star::sheet::DataPilotFieldFilter& 
rFilter) const;
+
 #if DEBUG_PIVOT_TABLE
 void dump() const;
 #endif
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 653bc0c..3d9f5af 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -1328,8 +1328,8 @@ public:
 {
 // Layout name takes precedence.
 const OUString* pLayoutName = pDim->GetLayoutName();
-if (pLayoutName)
-return *pLayoutName == maName;
+if (pLayoutName && *pLayoutName == maName)
+return true;
 
 sheet::GeneralFunction eGenFunc = 
static_cast(pDim->GetFunction());
 ScSubTotalFunc eFunc = ScDPUtil::toSubTotalFunc(eGenFunc);
diff --git a/sc/source/core/data/dpresfilter.cxx 
b/sc/source/core/data/dpresfilter.cxx
index 968be6b..41b2d7e 100644
--- a/sc/source/core/data/dpresfilter.cxx
+++ b/sc/source/core/data/dpresfilter.cxx
@@ -10,6 +10,8 @@
 #include "dpresfilter.hxx"
 #include "global.hxx"
 
+#include 
+
 #include 
 
 using namespace com::sun::star;
@@ -21,6 +23,12 @@ ScDPResultFilter::ScDPResultFilter(const OUString& rDimName, 
bool bDataLayout) :
 ScDPResultFilterContext::ScDPResultFilterContext() :
 mnCol(0), mnRow(0) {}
 
+size_t ScDPResultTree::NamePairHash::operator() (const NamePairType& rPair) 
const
+{
+OUStringHash aHash;
+return aHash(rPair.first) + aHash(rPair.second);
+}
+
 ScDPResultTree::DimensionNode::DimensionNode(const MemberNode* pParent) :
 mpParent(pParent) {}
 
@@ -89,6 +97,8 @@ void ScDPResultTree::add(
 {
 // TODO: I'll work on the col / row to value node mapping later.
 
+const OUString* pDimName = NULL;
+const OUString* pMemName = NULL;
 MemberNode* pMemNode = mpRoot;
 
 std::vector::const_iterator itFilter = rFilters.begin(), 
itFilterEnd = rFilters.end();
@@ -117,6 +127,8 @@ void ScDPResultTree::add(
 itDim = r.first;
 }
 
+pDimName = &itDim->first;
+
 // Now, see if this dimension member exists.
 DimensionNode* pDim = itDim->second;
 MembersType& rMembers = pDim->maChildMembers;
@@ -135,9 +147,26 @@ void ScDPResultTree::add(
 itMem = r.first;
 }
 
+pMemName = &itMem->first;
 pMemNode = itMem->second;
 }
 
+if (pDimName && pMemName)
+{
+NamePairType aNames(*pDimName, *pMemName);
+LeafValuesType::iterator it = maLeafValues.find(aNames);
+if (it == maLeafValues.end())
+{
+// This name pair doesn't exist.  Associate a new value for it.
+maLeafValues.insert(LeafValuesType::value_type(aNames, fVal));
+}
+else
+{
+// This name pair already exists. Set the value to NaN.
+rtl::math::setNan(&it->second);
+}
+}
+
 pMemNode->maValues.push_back(fVal);
 }
 
@@ -145,6 +174,7 @@ void ScDPResultTree::swap(ScDPResultTree& rOther)
 {
 std::swap(maPrimaryDimName, rOther.maPrimaryDimName);
 std::swap(mpRoot, rOther.mpRoot);
+maLeafValues.swap(rOther.maLeafValues);
 }
 
 bool ScDPResultTree::empty() const
@@ -184,6 +214,20 @@ const ScDPResultTree::ValuesType* 
ScDPResultTree::getResults(
 return &pMember->maValues;
 }
 
+double ScDPResultTree::getLeafResult(const 
com::sun::star::sheet::DataPilotFieldFilter& rFilter) const
+{
+NamePairType aPair(rFilter.FieldName, rFilter.MatchValue);
+LeafValuesType::const_iterator it = maLeafValues.find(aPair);
+if (it != maL

[Libreoffice-commits] core.git: codemaker/Executable_cppumaker.mk RepositoryExternal.mk

[David Tardon]

 RepositoryExternal.mk |6 ++
 codemaker/Executable_cppumaker.mk |1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 6c1614a6f000a8ef18ce0de241af649ac9588477
Author: David Tardon 
Date:   Wed Jan 8 13:49:46 2014 +0100

sal_textenc is a runtime dep of cppumaker

Change-Id: I9fd91ee8c15479e9956daa5c85a09f141ef6cc3f

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 0147876..98736fc 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3085,6 +3085,12 @@ $(call gb_Executable_add_runtime_dependencies,climaker,\
 )
 endef
 
+define gb_Executable__register_cppumaker
+$(call gb_Executable_add_runtime_dependencies,cppumaker,\
+   $(if $(filter-out ANDROID,$(OS)),$(call 
gb_Library_get_target,sal_textenc)) \
+)
+endef
+
 gb_Gallery__UNO_COMPONENTS := \
comphelper/util/comphelp \
configmgr/source/configmgr \
diff --git a/codemaker/Executable_cppumaker.mk 
b/codemaker/Executable_cppumaker.mk
index 049e0c7..26347a0 100644
--- a/codemaker/Executable_cppumaker.mk
+++ b/codemaker/Executable_cppumaker.mk
@@ -13,7 +13,6 @@ $(eval $(call 
gb_Executable_use_external,cppumaker,boost_headers))
 
 $(eval $(call gb_Executable_use_libraries,cppumaker,\
 sal \
-sal_textenc \
 salhelper \
 unoidl \
 ))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: Add sal_textenc dependency to cppumaker

[David Tardon]

Hi,

On Wed, Jan 08, 2014 at 11:38:09AM +0100, Stephan Bergmann wrote:
> On 12/30/2013 10:57 PM, Isamu Mogi wrote:
> >diff --git a/codemaker/Executable_cppumaker.mk 
> >b/codemaker/Executable_cppumaker.mk
> >index 26347a0..049e0c7 100644
> >--- a/codemaker/Executable_cppumaker.mk
> >+++ b/codemaker/Executable_cppumaker.mk
> >@@ -13,6 +13,7 @@ $(eval $(call 
> >gb_Executable_use_external,cppumaker,boost_headers))
> >
> >  $(eval $(call gb_Executable_use_libraries,cppumaker,\
> >  sal \
> >+sal_textenc \
> >  salhelper \
> >  unoidl \
> >  ))
> 
> sal_textenc is a runtime, not a build-time dependency of cppumaker.
> Do we have gbuild support to express that dependency in a better
> way?

We do, see commit 6c1614a6f000a8ef18ce0de241af649ac9588477 .

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

Re: Google Summer of Code 2014

[Tommy]

On Wed, 08 Jan 2014 11:05:12 +0100, Fridrich Strba  
 wrote:



Friends,

Just to keep you updated that the organization applications for the
Google Summer of Code 2014 will start the Monday after FOSDEM[1].



Cheers

Fridrich

[1]
http://www.google-melange.com/gsoc/document/show/gsoc_program/google/gsoc2014/help_page#2._What_is_the_program_timeline
[2] https://wiki.documentfoundation.org/Development/Gsoc/Ideas


is there a page with the list of previous GSoC completed tasks by year?

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

Auto: diga

[rcaballero]

Estimados, 
estaré de vacaciones y con acceso limitado a mis correos hasta el 10 de enero. 
Para cualquier tema relacionado con Vicuña Mackenna pueden contactar con 
Carolina Contreras (ccontre...@brunofritsch.cl) y con el Mall Plaza Vespucio 
pueden contactar a Rodrigo Mella (rme...@brunofritsch.cl). Muchas gracias. 
Un saludo y aprovecho para desearles felices fiesta y un próspero 2014, 
Ruyman Caballero

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - oox/source

[Muthu Subramanian]

 oox/source/drawingml/chart/seriesconverter.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit e8ac85752a2e07ceacb3b2f3e4eab3bc35a45c3d
Author: Muthu Subramanian 
Date:   Tue Oct 22 15:13:41 2013 +0530

n#839727 / rhbz#1038176 Crash fix

(cherry picked from commit e5f24e0c7c8f4799223c19359f4228f0b1a71461)

Change-Id: I8d733afbbc05900c68217ead44de798c1263ca84
Reviewed-on: https://gerrit.libreoffice.org/7309
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/oox/source/drawingml/chart/seriesconverter.cxx 
b/oox/source/drawingml/chart/seriesconverter.cxx
index 9ef1f3f..020b141 100644
--- a/oox/source/drawingml/chart/seriesconverter.cxx
+++ b/oox/source/drawingml/chart/seriesconverter.cxx
@@ -632,7 +632,8 @@ Reference< XDataSeries > SeriesConverter::createDataSeries( 
const TypeGroupConve
 {
 // Use number format code from Value series
 DataSourceModel* pValues = mrModel.maSources.get( 
SeriesModel::VALUES ).get();
-xLabels->maNumberFormat.maFormatCode = 
pValues->mxDataSeq->maFormatCode;
+if( pValues )
+xLabels->maNumberFormat.maFormatCode = 
pValues->mxDataSeq->maFormatCode;
 }
 DataLabelsConverter aLabelsConv( *this, *xLabels );
 aLabelsConv.convertFromModel( xDataSeries, rTypeGroup );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/tml/crack-1' - ios/experimental

[Tor Lillqvist]

 ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm |4 
 1 file changed, 4 insertions(+)

New commits:
commit 4fe40088b4e100f81cd9a75d90afdde6aebba627
Author: Tor Lillqvist 
Date:   Wed Jan 8 14:15:18 2014 +0200

Forgot a few components

Change-Id: Iec362bb343d1b0e48341ee669853aefd42d7b0bf

diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
index 87b54bc..5a3707b 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
@@ -21,6 +21,7 @@ extern "C" {
 extern void * avmedia_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * chartcore_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
 extern void * configmgr_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
+extern void * comphelp_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
 extern void * cui_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * deployment_component_getFactory( const char * pImplName, 
void * pServiceManager, void * pRegistryKey );
 extern void * embobj_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
@@ -82,7 +83,9 @@ lo_get_libmap(void)
 static lib_to_component_mapping map[] = {
 { "libanimcorelo.a", animcore_component_getFactory },
 { "libavmedialo.a", avmedia_component_getFactory },
+{ "libchartcorelo.a", chartcore_component_getFactory },
 { "libconfigmgrlo.a", configmgr_component_getFactory },
+{ "libcomphelper.a", comphelp_component_getFactory },
 { "libcuilo.a", cui_component_getFactory },
 { "libdeployment.a", deployment_component_getFactory },
 { "libembobj.a", embobj_component_getFactory },
@@ -125,6 +128,7 @@ lo_get_libmap(void)
 { "libunoxmllo.a", unoxml_component_getFactory },
 { "libutllo.a", utl_component_getFactory },
 { "libuuilo.a", uui_component_getFactory },
+{ "libvcllo.a", vcl_component_getFactory },
 { "libwpftwriterlo.a", wpftwriter_component_getFactory },
 { "libwriterfilterlo.a", writerfilter_component_getFactory },
 { "libxmlfdlo.a", xmlfd_component_getFactory },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

RE: Help/advise asked with deadlocks when opening Visio objects in Writer

[Winfried Donkers]

Hi Michael,

>it's usually possible to fix a deadlock from just a backtrace of all threads.

>you say you have a user who has been blessed by the gods with an ability to 
>reproduce the problem, so give them an LO with debug symbols (perhaps use 
>Kendy's fancy symbol-server thing or build it yourself), and once it's 
>properly locked up attach Visual Studio (or windbg) and copy all the stacks 
>and file a bug (CC: me).

I will set up and we'll see if the user is really blessed.
But as small changes (like trying again one minute later) can make that 
reproducing is not possible, it may be a long time before we're able to really 
catch a backtrace of the deadlock.

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

Re: Help/advise asked with deadlocks when opening Visio objects in Writer

[Michael Stahl]

On 08/01/14 12:00, Winfried Donkers wrote:

> The company I work for uses MS Visio to create illustrations, which are 
> embedded into Writer documents (and not saved separately as Visio document). 
> Since we started using LibreOffice versions later than 3.5 (I think), we have 
> seemingly random problems with LibreOffice freezing when opening an embedded 
> Visio object.
> The problem is very hard to reproduce (I have been trying for months, and 
> have succeeded only once*), but it can occur multiple times on a single day 
> for a single user. 

> I know that the SolarMutex issue is getting attention, and that area is far 
> beyond my capabilities.
> But could there be a way to recognize these deadlocks and kill these 
> deadlocks without killing the LibreOffice application?

not really.

> Possibly, with help from the experts, I might be able to create a temporary 
> 'patch' ...
> I have not created a bug report for this, since I could find no way to 
> reproduce the problem. Depending on your reaction(s) I will create the bug 
> report.

it's usually possible to fix a deadlock from just a backtrace of all
threads.

you say you have a user who has been blessed by the gods with an ability
to reproduce the problem, so give them an LO with debug symbols (perhaps
use Kendy's fancy symbol-server thing or build it yourself), and once
it's properly locked up attach Visual Studio (or windbg) and copy all
the stacks and file a bug (CC: me).


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

[Libreoffice-commits] core.git: Branch 'private/tml/crack-1' - ios/experimental

[Tor Lillqvist]

 ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm |   64 +++
 1 file changed, 32 insertions(+), 32 deletions(-)

New commits:
commit 56931759ea4f3b9306461d89fb836711bc713fed
Author: Tor Lillqvist 
Date:   Wed Jan 8 13:57:04 2014 +0200

First try to get it to match master after the matus+sberg changes

Change-Id: Ie82d6efc0e1ce13c5d9d4a1a18d3b5a4616de3e4

diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
index 84e94f6..87b54bc 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
@@ -17,18 +17,15 @@
 #include 
 
 extern "C" {
-extern void * analysis_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
 extern void * animcore_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
 extern void * avmedia_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * chartcore_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
+extern void * configmgr_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
 extern void * cui_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * date_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * dba_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * dbaxml_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * deployment_component_getFactory( const char * pImplName, 
void * pServiceManager, void * pRegistryKey );
 extern void * embobj_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * emboleobj_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
 extern void * evtatt_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * expwrap_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * filterconfig1_component_getFactory( const char * pImplName, 
void * pServiceManager, void * pRegistryKey );
 extern void * frm_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * fsstorage_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
@@ -37,21 +34,20 @@ extern "C" {
 extern void * fwm_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * hwp_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * hyphen_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * i18npool_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
+extern void * introspection_component_getFactory( const char * pImplName, 
void * pServiceManager, void * pRegistryKey );
 extern void * lng_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * lnth_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * localebe1_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
 extern void * oox_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * pricing_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * sc_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * scd_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * scfilt_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * sd_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * sdd_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * sm_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * smd_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * package2_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
+extern void * reflection_component_getFac

[Libreoffice-commits] core.git: Branch 'private/tml/crack-1' - ios/experimental

[Tor Lillqvist]

 ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm |   73 ---
 1 file changed, 59 insertions(+), 14 deletions(-)

New commits:
commit 79d36ea0f406d0846bda8475b0db701549518269
Author: Tor Lillqvist 
Date:   Wed Jan 8 13:22:14 2014 +0200

Make this compile again in this temporary branch

Change-Id: If025170ce850d23036df37106c3d8d5a8f6fd076

diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
index 074e472..84e94f6 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
@@ -16,12 +16,69 @@
 #include 
 #include 
 
+extern "C" {
+extern void * analysis_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
+extern void * animcore_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
+extern void * avmedia_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * chartcore_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
+extern void * cui_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * date_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * dba_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * dbaxml_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * embobj_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * emboleobj_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
+extern void * evtatt_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * expwrap_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * filterconfig1_component_getFactory( const char * pImplName, 
void * pServiceManager, void * pRegistryKey );
+extern void * frm_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * fsstorage_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
+extern void * fwk_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * fwl_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * fwm_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * hwp_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * hyphen_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * lng_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * lnth_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * oox_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * pricing_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * sc_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * scd_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * scfilt_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * sd_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * sdd_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * sm_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * smd_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * sot_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * spell_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * spl_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * svgfilter_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
+extern void * svt_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );

Help/advise asked with deadlocks when opening Visio objects in Writer

[Winfried Donkers]

Hi,

Background information:
The company I work for uses MS Visio to create illustrations, which are 
embedded into Writer documents (and not saved separately as Visio document). 
Since we started using LibreOffice versions later than 3.5 (I think), we have 
seemingly random problems with LibreOffice freezing when opening an embedded 
Visio object.
The problem is very hard to reproduce (I have been trying for months, and have 
succeeded only once*), but it can occur multiple times on a single day for a 
single user. 
The only way out is to kill LibreOffice (or Visio if you're lucky) with loss of 
recent changes as result. 
For my colleagues it is an extremely annoying problem and it feeds strong 
anti-LibreOffice feelings (my colleagues, not me).

Today, I had a breakthrough: a colleague reported that he received an error 
message, "algemene OLE fout". 
Normally, we don't get that, LibreOffice just freezes.
This string and opengrok led to ERRCODE_SO_GENERALERROR  belonging to the 
string, /core/sfx2/source/view/ipclient.cxx, which is the only file where 
ERRCODE_SO_GENERALERROR is used.
This led to a TODO-comment in 
/core/embeddedobj/source/commonembedding/embobj.cxx, 
OCommonEmbeddedObject::doVerb( ... ):
  " TODO: a gross hack to avoid deadlocks [...] "

I know that the SolarMutex issue is getting attention, and that area is far 
beyond my capabilities.
But could there be a way to recognize these deadlocks and kill these deadlocks 
without killing the LibreOffice application?
Possibly, with help from the experts, I might be able to create a temporary 
'patch' ...
I have not created a bug report for this, since I could find no way to 
reproduce the problem. Depending on your reaction(s) I will create the bug 
report.

Winfried

*I ran version 4.1.4 and 4.2.0 concurrently, opened a Visio object in one of 
the two and both froze. Killing the one with the Visio object, made the other 
accessible again.


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

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

Bug 65675 depends on bug 73007, which changed state.

Bug 73007 Summary: Calc: Value in the last cell repeats when scrolling with 
scroll bar
https://bugs.freedesktop.org/show_bug.cgi?id=73007

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |DUPLICATE

-- 
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] core.git: connectivity/source include/com

[Stephan Bergmann]

 connectivity/source/commontools/dbexception.cxx |2 --
 include/com/sun/star/uno/Type.h |2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 46cf9aed39ac50219a4e8dbcf0b16359cb3644ee
Author: Stephan Bergmann 
Date:   Wed Jan 8 11:47:38 2014 +0100

SAL_WARN_UNUSED css::uno::Type

Change-Id: I3b165e2a4414fd3d6c3cede5eb39beffa9fe7576

diff --git a/connectivity/source/commontools/dbexception.cxx 
b/connectivity/source/commontools/dbexception.cxx
index b05044f..9e8dc91 100644
--- a/connectivity/source/commontools/dbexception.cxx
+++ b/connectivity/source/commontools/dbexception.cxx
@@ -140,8 +140,6 @@ SQLExceptionInfo::SQLExceptionInfo(const staruno::Any& 
_rError)
 
//--
 void SQLExceptionInfo::implDetermineType()
 {
-staruno::Type aContentType = m_aContent.getValueType();
-
 const Type& aSQLExceptionType = ::getCppuType( static_cast< SQLException* 
>( 0 ) );
 const Type& aSQLWarningType = ::getCppuType( static_cast< SQLWarning* >( 0 
) );
 const Type& aSQLContextType  = ::getCppuType( static_cast< SQLContext* >( 
0 ) );
diff --git a/include/com/sun/star/uno/Type.h b/include/com/sun/star/uno/Type.h
index 9723622..c1e4303 100644
--- a/include/com/sun/star/uno/Type.h
+++ b/include/com/sun/star/uno/Type.h
@@ -52,7 +52,7 @@ enum UnoType_NoAcquire
 
 @see typelib_TypeDescriptionReference
 */
-class Type
+class SAL_WARN_UNUSED Type
 {
 /** the C typelib reference pointer
 */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: Add sal_textenc dependency to cppumaker

[Stephan Bergmann]

On 12/30/2013 10:57 PM, Isamu Mogi wrote:

commit 2cea4c98c2b9eaf46498fb76b73f8dae8e859f3b
Author: Isamu Mogi 
Date:   Wed Dec 18 21:43:13 2013 +0900

 Add sal_textenc dependency to cppumaker

 In Japanese localized Windows, cppumaker requires sal_textenclo.dll
 but that rule isn't written in .mk. It causes build failure.

 Change-Id: Icab74493a4a3b445144bb9d969b79636dbd17162
 Reviewed-on: https://gerrit.libreoffice.org/7134
 Reviewed-by: Kohei Yoshida 
 Tested-by: Kohei Yoshida 

diff --git a/codemaker/Executable_cppumaker.mk 
b/codemaker/Executable_cppumaker.mk
index 26347a0..049e0c7 100644
--- a/codemaker/Executable_cppumaker.mk
+++ b/codemaker/Executable_cppumaker.mk
@@ -13,6 +13,7 @@ $(eval $(call 
gb_Executable_use_external,cppumaker,boost_headers))

  $(eval $(call gb_Executable_use_libraries,cppumaker,\
  sal \
+sal_textenc \
  salhelper \
  unoidl \
  ))


sal_textenc is a runtime, not a build-time dependency of cppumaker.  Do 
we have gbuild support to express that dependency in a better way?


Stephan

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

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

Jan Holesovsky  changed:

   What|Removed |Added

 Depends on||73007

-- 
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] core.git: Branch 'refs/notes/commits' - e4/eb014761df0bd5c88acbcee1935743cb2a04e0

[Caolán McNamara]

 e4/eb014761df0bd5c88acbcee1935743cb2a04e0 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 11cc51cfb3a199f13edc7d7c87077ceef3a15a76
Author: Caolán McNamara 
Date:   Wed Jan 8 10:34:19 2014 +

Notes added by 'git notes add'

diff --git a/e4/eb014761df0bd5c88acbcee1935743cb2a04e0 
b/e4/eb014761df0bd5c88acbcee1935743cb2a04e0
new file mode 100644
index 000..caa618a
--- /dev/null
+++ b/e4/eb014761df0bd5c88acbcee1935743cb2a04e0
@@ -0,0 +1 @@
+merged as: 396b3594feb735e1a9cd1564f28340d514f9d925
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tsutomu Uchino]

 framework/source/uielement/uicommanddescription.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 396b3594feb735e1a9cd1564f28340d514f9d925
Author: Tsutomu Uchino 
Date:   Wed Jan 8 08:36:06 2014 +

Resolves: #i118909# fix empty elements of return value...

in UICategoryDescription::getElementNames

(cherry picked from commit e4eb014761df0bd5c88acbcee1935743cb2a04e0)

Change-Id: Ib5a2e14ecb446c339afe5e53be435478845a4024

diff --git a/framework/source/uielement/uicommanddescription.cxx 
b/framework/source/uielement/uicommanddescription.cxx
index fb39ab5..9480d46 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -735,7 +735,7 @@ throw (::com::sun::star::uno::RuntimeException)
 ModuleToCommandFileMap::const_iterator pIter = 
m_aModuleToCommandFileMap.begin();
 while ( pIter != m_aModuleToCommandFileMap.end() )
 {
-aSeq[n] = pIter->first;
+aSeq[n++] = pIter->first;
 ++pIter;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 3a/cdfc0f4c1f30c9030361e51c13d19556ea816f

[Caolán McNamara]

 3a/cdfc0f4c1f30c9030361e51c13d19556ea816f |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3da3a58b43bf69e94aa3dc68fdb1e661493fff9d
Author: Caolán McNamara 
Date:   Wed Jan 8 10:24:12 2014 +

Notes added by 'git notes add'

diff --git a/3a/cdfc0f4c1f30c9030361e51c13d19556ea816f 
b/3a/cdfc0f4c1f30c9030361e51c13d19556ea816f
new file mode 100644
index 000..e8ed90f
--- /dev/null
+++ b/3a/cdfc0f4c1f30c9030361e51c13d19556ea816f
@@ -0,0 +1 @@
+merged as: 55e5c0faafbc3c4f503722000912ec7a022d98db
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tsutomu Uchino]

 sfx2/source/dialog/mgetempl.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 55e5c0faafbc3c4f503722000912ec7a022d98db
Author: Tsutomu Uchino 
Date:   Wed Jan 8 08:11:15 2014 +

Resolves: #i18109# pre-select the name in new style dialog

(cherry picked from commit 3acdfc0f4c1f30c9030361e51c13d19556ea816f)

Conflicts:
sfx2/source/dialog/mgetempl.cxx

Change-Id: I61faf0195d8ee8976e85bcf1a49561eeebc72b39

diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 5462100..b087613 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -416,6 +416,7 @@ void SfxManageStyleSheetPage::Reset( const SfxItemSet& 
/*rAttrSet*/ )
 if ( sCmp != aName )
 pStyle->SetName( aName );
 m_pNameRw->SetText( aName );
+m_pNameRw->SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
 
 if ( m_pFollowLb->IsEnabled() )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2d/7bf3f95cdecc12068a4e7ed80ee39e94703e9a

[Caolán McNamara]

 2d/7bf3f95cdecc12068a4e7ed80ee39e94703e9a |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 681e56ed17b7baa67df065f73d0cc5f5e2737113
Author: Caolán McNamara 
Date:   Wed Jan 8 10:22:35 2014 +

Notes added by 'git notes add'

diff --git a/2d/7bf3f95cdecc12068a4e7ed80ee39e94703e9a 
b/2d/7bf3f95cdecc12068a4e7ed80ee39e94703e9a
new file mode 100644
index 000..8c3572b
--- /dev/null
+++ b/2d/7bf3f95cdecc12068a4e7ed80ee39e94703e9a
@@ -0,0 +1 @@
+prefer: 61f6193d26615e5849a97d670f77d71c7f7d8dea
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst   |   11 -
 source/text/shared/01/0536.xhp |   44 ++---
 2 files changed, 22 insertions(+), 33 deletions(-)

New commits:
commit d9e8232f139ed14b155d2b8455718758056c3b26
Author: Caolán McNamara 
Date:   Wed Jan 8 10:12:46 2014 +

update help ids for distribution page .ui conversion

Change-Id: I297ca231ea84f470bacc9d4748232ecfe5903ddd

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index c77a451..d4f9800 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2613,7 +2613,6 @@ HID_PAGE_DBWIZARD_TEXT_RB_ACCESSOTHERFILES,39077,
 HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES,39075,
 HID_PAGE_DBWIZARD_USERDEFINED_BROWSE,39146,
 HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE,39145,
-HID_PAGE_DISTRIBUTE,33859,
 HID_PASSWD_DOC,58994,
 HID_PASSWD_TABLE,58993,
 HID_POPUP_COLOR,33838,
@@ -6786,16 +6785,6 @@ 
svx_RadioButton_RID_SVXPAGE_ALIGN_PARAGRAPH_BTN_RIGHTALIGN,703775263,
 svx_RadioButton_RID_SVXPAGE_BACKGROUND_BTN_AREA,700727833,
 svx_RadioButton_RID_SVXPAGE_BACKGROUND_BTN_POSITION,700727835,
 svx_RadioButton_RID_SVXPAGE_BACKGROUND_BTN_TILE,700727834,
-svx_RadioButton_RID_SVXPAGE_DISTRIBUTE_BTN_HOR_CENTER,704578052,
-svx_RadioButton_RID_SVXPAGE_DISTRIBUTE_BTN_HOR_DISTANCE,704578053,
-svx_RadioButton_RID_SVXPAGE_DISTRIBUTE_BTN_HOR_LEFT,704578051,
-svx_RadioButton_RID_SVXPAGE_DISTRIBUTE_BTN_HOR_NONE,704578050,
-svx_RadioButton_RID_SVXPAGE_DISTRIBUTE_BTN_HOR_RIGHT,704578054,
-svx_RadioButton_RID_SVXPAGE_DISTRIBUTE_BTN_VER_BOTTOM,704578060,
-svx_RadioButton_RID_SVXPAGE_DISTRIBUTE_BTN_VER_CENTER,704578058,
-svx_RadioButton_RID_SVXPAGE_DISTRIBUTE_BTN_VER_DISTANCE,704578059,
-svx_RadioButton_RID_SVXPAGE_DISTRIBUTE_BTN_VER_NONE,704578056,
-svx_RadioButton_RID_SVXPAGE_DISTRIBUTE_BTN_VER_TOP,704578057,
 svx_RadioButton_RID_SVXPAGE_HYPERLINK_INTERNET_RB_LINKTYP_FTP,704446979,
 svx_RadioButton_RID_SVXPAGE_HYPERLINK_INTERNET_RB_LINKTYP_INTERNET,704446978,
 svx_RadioButton_RID_SVXPAGE_HYPERLINK_MAIL_RB_LINKTYP_MAIL,704463362,
diff --git a/source/text/shared/01/0536.xhp 
b/source/text/shared/01/0536.xhp
index 2c5d370..30adfbf 100644
--- a/source/text/shared/01/0536.xhp
+++ b/source/text/shared/01/0536.xhp
@@ -31,8 +31,8 @@
 
 
 
-
-
+
+
 Distribution
 
 Distributes three or more selected objects 
evenly along the horizontal axis or the vertical axis. You can also evenly 
distribute the spacing between objects.
@@ -43,37 +43,37 @@
 Objects are distributed with respect to the outermost objects in the 
selection.
 Horizontally
 Specify the horizontal distribution for the selected 
objects.
-
+
 None
-Does not distribute 
the objects horizontally.
-
+Does not distribute the 
objects horizontally.
+
 Left
-Distributes the 
selected objects, so that the left edges of the objects are evenly spaced from 
one another.
-
+Distributes the 
selected objects, so that the left edges of the objects are evenly spaced from 
one another.
+
 Center
-Distributes the 
selected objects, so that the horizontal centers of the objects are evenly 
spaced from one another.
-
+Distributes the 
selected objects, so that the horizontal centers of the objects are evenly 
spaced from one another.
+
 Spacing
-Distributes the 
selected objects horizontally, so that the objects are evenly spaced from one 
another.
-
+Distributes the 
selected objects horizontally, so that the objects are evenly spaced from one 
another.
+
 Right
-Distributes the 
selected objects, so that the right edges of the objects are evenly spaced from 
one another.
+Distributes the 
selected objects, so that the right edges of the objects are evenly spaced from 
one another.
 Vertically
 Specify the vertical distribution for the selected 
objects.
-
+
 None
-Does not distribute 
the objects vertically.
-
+Does not distribute 
the objects vertically.
+
 Top
-Distributes the 
selected objects, so that the top edges of the objects are evenly spaced from 
one another.
-
+Distributes the 
selected objects, so that the top edges of the objects are evenly spaced from 
one another.
+
 Center
-Distributes the 
selected objects, so that the vertical centers of the objects are evenly spaced 
from one another.
-
+Distributes the 
selected objects, so that the vertical centers of the objects are evenly spaced 
from one another.
+
 Spacing
-Distributes the 
selected objects vertically, so that the objects are evenly spaced from one 
another.
-
+Distributes the 
selected objects vertically, so that the objects are evenly spaced from one 
another.
+
 Bottom
-Distributes the 
selected objects, so that the bottom edges of the objects are evenly spaced 
from one another.
+Distributes the 
selected objects, so that the bottom edges of the objects are evenly spaced 
from one another.
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk include/svx

[Caolán McNamara]

 cui/AllLangResTarget_cui.mk   |1 
 cui/UIConfig_cui.mk   |2 
 cui/source/factory/dlgfact.cxx|2 
 cui/source/inc/dstribut.hxx   |   44 +--
 cui/source/inc/helpid.hrc |2 
 cui/source/tabpages/dstribut.cxx  |  152 
 cui/source/tabpages/dstribut.hrc  |   40 ---
 cui/source/tabpages/dstribut.src  |  212 -
 cui/uiconfig/ui/distributiondialog.ui |   82 ++
 cui/uiconfig/ui/distributionpage.ui   |  412 ++
 include/svx/dialogs.hrc   |1 
 11 files changed, 571 insertions(+), 379 deletions(-)

New commits:
commit 094869634d491a96e9de109a14fe4fc8db90a30a
Author: Caolán McNamara 
Date:   Wed Jan 8 09:22:59 2014 +

can drop SfxNoLayoutSingleTabDialog use here now

Change-Id: I668b4f0b767d3a93a1407ae4ba7922235815a28b

diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index e5f5c42..0b59749 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/connpooloptions \
cui/uiconfig/ui/customizedialog \
cui/uiconfig/ui/dbregisterpage \
+   cui/uiconfig/ui/distributiondialog \
cui/uiconfig/ui/distributionpage \
cui/uiconfig/ui/effectspage \
cui/uiconfig/ui/formatcellsdialog \
diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx
index c3133b6..1222841 100644
--- a/cui/source/inc/dstribut.hxx
+++ b/cui/source/inc/dstribut.hxx
@@ -56,15 +56,14 @@ public:
 SvxDistributeVertical GetDistributeVer() const { return m_eDistributeVer; }
 };
 
-class SvxDistributeDialog : public SfxNoLayoutSingleTabDialog
+class SvxDistributeDialog : public SfxSingleTabDialog
 {
-SvxDistributePage*  mpPage;
+SvxDistributePage* mpPage;
 
 public:
 SvxDistributeDialog(Window* pParent, const SfxItemSet& rAttr,
 SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone,
 SvxDistributeVertical eVer = SvxDistributeVerticalNone);
-~SvxDistributeDialog();
 
 SvxDistributeHorizontal GetDistributeHor() const { return 
mpPage->GetDistributeHor(); }
 SvxDistributeVertical GetDistributeVer() const { return 
mpPage->GetDistributeVer(); }
diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx
index 8604b87..20dfb45 100644
--- a/cui/source/tabpages/dstribut.cxx
+++ b/cui/source/tabpages/dstribut.cxx
@@ -38,27 +38,15 @@ static sal_uInt16 pRanges[] =
 |*
 \/
 
-SvxDistributeDialog::SvxDistributeDialog(
-Window* pParent,
-const SfxItemSet& rInAttrs,
-SvxDistributeHorizontal eHor,
+SvxDistributeDialog::SvxDistributeDialog(Window* pParent,
+const SfxItemSet& rInAttrs, SvxDistributeHorizontal eHor,
 SvxDistributeVertical eVer)
-:   SfxNoLayoutSingleTabDialog(pParent, rInAttrs, RID_SVXPAGE_DISTRIBUTE ),
-mpPage(0L)
-{
-mpPage = new SvxDistributePage(this, rInAttrs, eHor, eVer);
-SetTabPage(mpPage);
-SetText(mpPage->GetText());
-}
-
-/*
-|*
-|* Dtor
-|*
-\/
-
-SvxDistributeDialog::~SvxDistributeDialog()
+: SfxSingleTabDialog(pParent, rInAttrs, "DistributionDialog",
+"cui/ui/distributiondialog.ui")
+, mpPage(NULL)
 {
+mpPage = new SvxDistributePage(get_content_area(), rInAttrs, eHor, eVer);
+setTabPage(mpPage);
 }
 
 /*
@@ -97,12 +85,12 @@ SvxDistributePage::SvxDistributePage(Window* pWindow,
 SfxTabPage* SvxDistributePage::Create(Window* pWindow, const SfxItemSet& 
rAttrs,
 SvxDistributeHorizontal eHor, SvxDistributeVertical eVer)
 {
-return(new SvxDistributePage(pWindow, rAttrs, eHor, eVer));
+return new SvxDistributePage(pWindow, rAttrs, eHor, eVer);
 }
 
 sal_uInt16* SvxDistributePage::GetRanges()
 {
-return(pRanges);
+return pRanges;
 }
 
 void SvxDistributePage::PointChanged(Window* /*pWindow*/, RECT_POINT /*eRP*/)
diff --git a/cui/uiconfig/ui/distributiondialog.ui 
b/cui/uiconfig/ui/distributiondialog.ui
new file mode 100644
index 000..49e2dfa
--- /dev/null
+++ b/cui/uiconfig/ui/distributiondialog.ui
@@ -0,0 +1,82 @@
+
+
+
+  
+  
+False
+6
+Distribution
+dialog
+
+  
+False
+vertical
+12
+
+  
+False
+end
+
+  
+gtk-ok
+True
+True
+True
+True
+True
+True
+  
+  
+False
+True
+0
+  
+
+
+  
+gtk-cancel
+True
+True
+  

[Libreoffice-commits] core.git: helpcontent2

[Caolán McNamara]

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

New commits:
commit b434b00dd75c2ddd93c42e867e89a3c18f1e3e6a
Author: Caolán McNamara 
Date:   Wed Jan 8 10:12:46 2014 +

Updated core
Project: help  d9e8232f139ed14b155d2b8455718758056c3b26

diff --git a/helpcontent2 b/helpcontent2
index 2fb2126..d9e8232 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2fb21267953bd0f2f2509080cb8de86a50fc0f3f
+Subproject commit d9e8232f139ed14b155d2b8455718758056c3b26
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/tml/crack-1' - 2 commits - codemaker/source include/osl

[Tor Lillqvist]

 codemaker/source/cppumaker/cpputype.cxx |   31 ++-
 include/osl/detail/component-defines.h  |   42 
 2 files changed, 3 insertions(+), 70 deletions(-)

New commits:
commit e382caf3c9cf72d6fda41ef0e29975fc92b9abd7
Author: Tor Lillqvist 
Date:   Wed Jan 8 11:44:23 2014 +0200

Revert "WIP: Direct service ctor calls at least on Android/iOS"

This reverts commit 15abebbde560e17413f17b16b8b2e9c1f31f01a5.

diff --git a/codemaker/source/cppumaker/cpputype.cxx 
b/codemaker/source/cppumaker/cpputype.cxx
index 4bd7a98..c0065d0 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -3408,17 +3408,6 @@ void ServiceType::dumpHxxFile(
 OUString headerDefine(dumpHeaderDefine(o, "HPP"));
 o << "\n";
 includes.dump(o, 0);
-if (!entity_->getConstructors().empty()) {
-o << ("\n#if defined ANDROID || defined IOS //TODO\n"
-  "#include \n#endif\n\n"
-  "#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_")
-  << name_.replaceAll(".", "_dot_")
-  << " && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_"
-  << name_.replaceAll(".", "_dot_") << ") && defined LO_URE_CTOR_FUN_"
-  << name_.replaceAll(".", "_dot_")
-  << "\nextern \"C\" void * SAL_CALL LO_URE_CTOR_FUN_"
-  << name_.replaceAll(".", "_dot_") << "(void *, void *);\n#endif\n";
-}
 o << "\n";
 if (codemaker::cppumaker::dumpNamespaceOpen(o, name_, false)) {
 o << "\n";
@@ -3447,28 +3436,14 @@ void ServiceType::dumpHxxFile(
   << "::css::uno::Reference< " << scopedBaseName
   << " > the_instance;\n" << indent() << "try {\n";
 inc();
-o << ("#if defined LO_URE_CURRENT_ENV && defined "
-  "LO_URE_CTOR_ENV_")
-  << name_.replaceAll(".", "_dot_")
-  << " && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_"
-  << name_.replaceAll(".", "_dot_")
-  << ") && defined LO_URE_CTOR_FUN_"
-  << name_.replaceAll(".", "_dot_") << "\n" << indent()
-  << "the_instance = ::css::uno::Reference< " << scopedBaseName
-  << (" >(::css::uno::Reference< ::css::uno::XInterface >("
-  "static_cast< ::css::uno::XInterface * >((*"
-  "LO_URE_CTOR_FUN_")
-  << name_.replaceAll(".", "_dot_")
-  << (")(the_context.get(), ::css::uno::Sequence<"
-  " ::css::uno::Any >().get())), ::SAL_NO_ACQUIRE),"
-  " ::css::uno::UNO_QUERY);\n#else\n")
-  << indent() << "the_instance = ::css::uno::Reference< "
+o << indent()
+  << "the_instance = ::css::uno::Reference< "
   << scopedBaseName
   << (" >(the_context->getServiceManager()->"
   "createInstanceWithContext(::rtl::OUString("
   " \"")
   << name_
-  << "\" ), the_context), ::css::uno::UNO_QUERY);\n#endif\n";
+  << "\" ), the_context), ::css::uno::UNO_QUERY);\n";
 dec();
 o << indent()
   << "} catch (const ::css::uno::RuntimeException &) {\n";
diff --git a/include/osl/detail/component-defines.h 
b/include/osl/detail/component-defines.h
deleted file mode 100644
index 63893ea..000
--- a/include/osl/detail/component-defines.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#ifndef INCLUDED_OSL_DETAIL_COMPONENT_DEFINES_H
-#define INCLUDED_OSL_DETAIL_COMPONENT_DEFINES_H
-
-/* Experimental direct constructor calls, under construction */
-
-#define LO_URE_CURRENT_ENV 1 /*TODO*/
-
-#define 
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_comp_dot_extensions_dot_xml_dot_sax_dot_FastParser
 1 /*TODO*/
-#define 
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_comp_dot_extensions_dot_xml_dot_sax_dot_FastParser
 com_sun_star_comp_extensions_xml_sax_FastParser
-#define 
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_comp_dot_extensions_dot_xml_dot_sax_dot_ParserExpat
 1 /*TODO*/
-#define 
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_comp_dot_extensions_dot_xml_dot_sax_dot_ParserExpat
 com_sun_star_comp_extensions_xml_sax_ParserExpat
-#define 
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_DLLComponentLoader 1 
/*TODO*/
-#define 
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_DLLComponentLoader 
com_sun_star_comp_stoc_DLLComponentLoader
-#define 
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_Implement

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - framework/source sfx2/source writerfilter/inc writerfilter/source

[Herbert Dürr]

 framework/source/uielement/uicommanddescription.cxx |2 +-
 sfx2/source/dialog/mgetempl.cxx |1 +
 writerfilter/inc/ooxml/OOXMLDocument.hxx|2 +-
 writerfilter/source/ooxml/OOXMLDocumentImpl.cxx |2 +-
 writerfilter/source/ooxml/OOXMLDocumentImpl.hxx |2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 2d7bf3f95cdecc12068a4e7ed80ee39e94703e9a
Author: Herbert Dürr 
Date:   Wed Jan 8 09:02:05 2014 +

#i123693# WaE: const type qualifier ignored on return value

this fix removes another 70 warnings when building with a newer gcc

diff --git a/writerfilter/inc/ooxml/OOXMLDocument.hxx 
b/writerfilter/inc/ooxml/OOXMLDocument.hxx
index fab2ab3..16449fc 100644
--- a/writerfilter/inc/ooxml/OOXMLDocument.hxx
+++ b/writerfilter/inc/ooxml/OOXMLDocument.hxx
@@ -242,7 +242,7 @@ public:
 virtual uno::Reference getInputStreamForId( const 
::rtl::OUString & rId ) = 0;
 
 virtual void setIDForXNoteStream( const sal_Int32 nID ) = 0;
-virtual const sal_Int32 getIDForXNoteStream() const = 0;
+virtual sal_Int32 getIDForXNoteStream() const = 0;
 
 virtual const ::rtl::OUString & getTarget() const = 0;
 };
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx 
b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index cd92bdf..b801435 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -132,7 +132,7 @@ void OOXMLDocumentImpl::setIDForXNoteStream( const 
sal_Int32 nID )
 mnIDForXNoteStream = nID;
 }
 
-const sal_Int32 OOXMLDocumentImpl::getIDForXNoteStream() const
+sal_Int32 OOXMLDocumentImpl::getIDForXNoteStream() const
 {
 return mnIDForXNoteStream;
 }
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx 
b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
index 1d1ca53..6b611e1 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
@@ -120,7 +120,7 @@ public:
 virtual uno::Reference getInputStreamForId(const 
rtl::OUString & rId);
 
 virtual void setIDForXNoteStream( const sal_Int32 nID );
-virtual const sal_Int32 getIDForXNoteStream() const;
+virtual sal_Int32 getIDForXNoteStream() const;
 
 virtual const ::rtl::OUString & getTarget() const;
 };
commit e4eb014761df0bd5c88acbcee1935743cb2a04e0
Author: Tsutomu Uchino 
Date:   Wed Jan 8 08:36:06 2014 +

#i118909# fix empty elements of return value in 
UICategoryDescription::getElementNames

diff --git a/framework/source/uielement/uicommanddescription.cxx 
b/framework/source/uielement/uicommanddescription.cxx
index 6e66113..dbd9b8e 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -761,7 +761,7 @@ throw (::com::sun::star::uno::RuntimeException)
 ModuleToCommandFileMap::const_iterator pIter = 
m_aModuleToCommandFileMap.begin();
 while ( pIter != m_aModuleToCommandFileMap.end() )
 {
-aSeq[n] = pIter->first;
+aSeq[n++] = pIter->first;
 ++pIter;
 }
 
commit 3acdfc0f4c1f30c9030361e51c13d19556ea816f
Author: Tsutomu Uchino 
Date:   Wed Jan 8 08:11:15 2014 +

#i18109# pre-select the name in new style dialog

diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index c70b826..0d5a9c4 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -494,6 +494,7 @@ void SfxManageStyleSheetPage::Reset( const SfxItemSet& 
/*rAttrSet*/ )
 if ( sCmp != aName )
 pStyle->SetName( aName );
 aNameEd.SetText( aName );
+aNameEd.SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
 
 if ( aFollowLb.IsEnabled() )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Google Summer of Code 2014

[Fridrich Strba]

Friends,

Just to keep you updated that the organization applications for the
Google Summer of Code 2014 will start the Monday after FOSDEM[1]. We
volunteer with Cedric to administer it this year too. But we would need
your help to update the ideas page with whatever idea you might have and
clean out the ideas that were finished in the previous cycle.

We will update the wiki little by little with the important dates.

Cheers

Fridrich

[1]
http://www.google-melange.com/gsoc/document/show/gsoc_program/google/gsoc2014/help_page#2._What_is_the_program_timeline
[2] https://wiki.documentfoundation.org/Development/Gsoc/Ideas
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: odk/examples

[Stephan Bergmann]

 odk/examples/DevelopersGuide/Config/ConfigExamples.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 123eadba31677804a010c4bc732a3682039498d5
Author: Stephan Bergmann 
Date:   Wed Jan 8 10:50:09 2014 +0100

typo

Change-Id: Ia6aef40daa81e76051fd5b6ce7d4e38da1262b25

diff --git a/odk/examples/DevelopersGuide/Config/ConfigExamples.java 
b/odk/examples/DevelopersGuide/Config/ConfigExamples.java
index ae3b0ce..0ca89aa 100644
--- a/odk/examples/DevelopersGuide/Config/ConfigExamples.java
+++ b/odk/examples/DevelopersGuide/Config/ConfigExamples.java
@@ -163,7 +163,7 @@ public class ConfigExamples
 
 }
 
-/** Do some simple checks, if tehre is a valid ConfigurationProvider
+/** Do some simple checks, if there is a valid ConfigurationProvider
 */
 public static boolean checkProvider(XMultiServiceFactory xProvider)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Want to contribute as a OS Developer in Libreoffice Project

[Noel Grandin]

On 2014-01-08 10:31, jitendra pradhan wrote:


I would like to actively participate in the open source project *Libreoffice*. I am having more than 7 years of work 
experience on Linux kernel. I have worked on some other OS like NCGL(Nortel carrier Grade Linux) as well. So I would 
like to contribute as Developer in the Libreoffice project. So its my sincere request to guide me for becoming a part 
of this project.





Hi

Welcome aboard!

Your best bet is to start here:
https://wiki.documentfoundation.org/Development
and try checking out and building LO itself.

Regards, Noel.

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


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