date:20140708

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

2014-07-08 Thread Stephan Bergmann

 vcl/source/gdi/gdimtf.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 1bc9ca7fac160ad1ff03695c0343347cffb37b29
Author: Stephan Bergmann 
Date:   Wed Jul 9 08:47:47 2014 +0200

Avoid undefined premature downcast to potentially wrong type

Change-Id: I53bf8b74edab720fccc829f9228f7d9c4a8c2dad

diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 4fc7d3f..36c1022 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -362,11 +362,10 @@ void GDIMetaFile::Play( OutputDevice* pOut, size_t nPos )
 {
 if( !Hook() && pAction )
 {
-MetaCommentAction* pCommentAct = 
static_cast(pAction);
 if( pAction->GetType() == META_COMMENT_ACTION &&
-pCommentAct->GetComment() == 
"DELEGATE_PLUGGABLE_RENDERER" )
+static_cast(pAction)->GetComment() 
== "DELEGATE_PLUGGABLE_RENDERER" )
 {
-ImplDelegate2PluggableRenderer(pCommentAct, pOut);
+
ImplDelegate2PluggableRenderer(static_cast(pAction), pOut);
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-07-08 Thread Stephan Bergmann

 reportdesign/source/ui/dlg/Condition.cxx |1 -
 reportdesign/source/ui/dlg/Condition.hxx |1 -
 2 files changed, 2 deletions(-)

New commits:
commit aa9aff1483a58f8e5a484487710422349a5301a1
Author: Stephan Bergmann 
Date:   Wed Jul 9 08:14:30 2014 +0200

-Werror,-Wunused-private-field

Change-Id: I9d540c2a404600bba038853d73d0cce63f162ea2

diff --git a/reportdesign/source/ui/dlg/Condition.cxx 
b/reportdesign/source/ui/dlg/Condition.cxx
index 12e675b..c7d64a7 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -210,7 +210,6 @@ Condition::Condition( Window* _pParent, 
IConditionalFormatAction& _rAction, ::rp
 ,m_pBtnUpdaterFontColor(NULL)
 ,m_pBtnUpdaterBackgroundColor(NULL)
 ,m_nCondIndex( 0 )
-,m_nLastKnownWindowWidth( -1 )
 ,m_bInDestruction( false )
 {
 m_pUIBuilder = new VclBuilder(this, getUIRootDir(), 
"modules/dbreport/ui/conditionwin.ui");
diff --git a/reportdesign/source/ui/dlg/Condition.hxx 
b/reportdesign/source/ui/dlg/Condition.hxx
index 7635082..b127088 100644
--- a/reportdesign/source/ui/dlg/Condition.hxx
+++ b/reportdesign/source/ui/dlg/Condition.hxx
@@ -96,7 +96,6 @@ namespace rptui
 
 
 size_t  m_nCondIndex;
-longm_nLastKnownWindowWidth;
 boolm_bInDestruction;
 
 ConditionalExpressions  m_aConditionalExpressions;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

LibreOffice Gerrit News for core on 2014-07-09

2014-07-08 Thread gerrit

Moin!

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

 First time contributors doing great things! 
+ vcl/source/window/wrkwin.cxx: drop unused svsys.h header
  in https://gerrit.libreoffice.org/10152 from Douglas Mencken
  about module vcl
+ RID_DLG_SELECTLABELCONTROL and 3 tab pages conversion to .ui
  in https://gerrit.libreoffice.org/10150 from Szymon Kłos
  about module extensions
+ allow modern GCC to be automatically chosen on OS X 10.5
  in https://gerrit.libreoffice.org/10118 from Douglas Mencken
  about module build
+ MD_DDE_LINKEDIT conversion to .ui
  in https://gerrit.libreoffice.org/10146 from Szymon Kłos
  about module sfx2
+ WaE: add corresponding CXXflag for c++11 stuff
  in https://gerrit.libreoffice.org/10130 from Douglas Mencken
  about module build, solenv
+ fdo#74745-Test Case for importing custom property of type date correctly 
  in https://gerrit.libreoffice.org/10132 from Charu Tyagi
  about module sw
 End of freshness 

+ Translate German comments (continued)
  in https://gerrit.libreoffice.org/10151 from Philipp Weissenbacher
  about module svl
+ fdo#57950 Replace chained append( with operator+)
  in https://gerrit.libreoffice.org/10149 from Petr Vorel
  about module idl
+ fix fdo#77844: header wrongly enabled from .doc
  in https://gerrit.libreoffice.org/10100 from Luke Deller
  about module sw
+ new loplugin: externalandnotdefined
  in https://gerrit.libreoffice.org/9901 from Noel Grandin
  about module basctl, basic, bean, bridges, chart2, compilerplugins, cppu, 
cppuhelper, desktop, editeng, embeddedobj, filter, forms, include, jvmfwk, 
reportdesign, rsc, sal, sc, scripting, sd, sfx2, svx, sw, toolkit, vcl
+ enable ww8import/export tests for mac
  in https://gerrit.libreoffice.org/10144 from Luke Deller
  about module sw
+ fdo#80195 IFERROR() fails to return correct value
  in https://gerrit.libreoffice.org/9830 from Winfried Donkers
  about module sc
+ Use assert instead of OSL_ASSERT in sal/
  in https://gerrit.libreoffice.org/10113 from Arnaud Versini
  about module sal


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

+ Bump build-time system python's requirement to 2.6.
  in https://gerrit.libreoffice.org/10116 from Douglas Mencken
+ Convert RID_CONDFORMAT to .ui
  in https://gerrit.libreoffice.org/10064 from Mihály Palenik
+ use SimpleReferenceObject in svtools module
  in https://gerrit.libreoffice.org/10125 from Noel Grandin
+ configure, gbuild: remove Cygwin paths from make environment
  in https://gerrit.libreoffice.org/9698 from Michael Stahl
+ fdo#73148 add options to Calc function AGGREGATE
  in https://gerrit.libreoffice.org/9449 from Winfried Donkers
+ draw white border around note marks for fdo#81032
  in https://gerrit.libreoffice.org/10135 from Laurent Godard
+ auto-detect the presence of a native gmake on windows
  in https://gerrit.libreoffice.org/10120 from Michael Stahl


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

+ nss/nspr: enable X86_64 build, WNT (MSC) was already available
  in https://gerrit.libreoffice.org/10148 from Robert Antoni Buj i Gelonch
+ fix fdo#77844: header wrongly enabled from .doc
  in https://gerrit.libreoffice.org/10145 from Luke Deller
+ MM: always copy the internal document
  in https://gerrit.libreoffice.org/9863 from Jan-Marek Glogowski
+ Replace the whole content for copied documents
  in https://gerrit.libreoffice.org/9862 from Jan-Marek Glogowski
+ webdav: fix locking in webdav_ucp::Content::getResourceType()
  in https://gerrit.libreoffice.org/10128 from Matúš Kukan
+ webdav: Do not call into DAVResourceAccess with mutex locked.
  in https://gerrit.libreoffice.org/10127 from Matúš Kukan
+ webdav: Do not throw when saving new document.
  in https://gerrit.libreoffice.org/10126 from Matúš Kukan


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

+ fdo#78947 : The File gets corrupted when saved in LO
  in https://gerrit.libreoffice.org/9775 from BisalNayal
+ fdo#79018: LO hangs while opening file.
  in https://gerrit.libreoffice.org/9564 from Yogesh Bharate
+ sw/docx export: fix handling of document with header and section(s)
  in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer
+ move OpenGLContext to SAL
  in https://gerrit.libreoffice.org/9429 from David Tardon
+ Changes for Wordml
  in https://gerrit.libreoffice.org/9013 from Michel Messak
+ fdo#64945 Remove inconvenient localized symbol code.
  in https://gerrit.libreoffice.org/8696 from Darshana Padmadas
+ fdo#77716 : Paragraph spacing is not preserved after RT.
  in https://gerrit.libreoffice.org/9197 from Tushar Bende
+ Lots of changes to Tango icons
  in https://gerrit.libreoffice.org/7987 from Miroslav Mazel
+ Refactored swooxmlexport tests cases. Added function to check contents.
  in https://gerrit.libreoffice.org/8390 from Nikhil Walvekar
+ fdo#77121 Header / Footer positions not preserved after RT
  in https://gerrit.l

[Bug 75025] LibreOffice 4.3 most annoying bugs

2014-07-08 Thread bugzilla-daemon

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

--- Comment #39 from Joel Madero  ---
added bug 80448 - regression
ODS causing a crash, bibisected and backtrace on the bug

-- 
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 75025] LibreOffice 4.3 most annoying bugs

2014-07-08 Thread bugzilla-daemon

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

Joel Madero  changed:

   What|Removed |Added

 Depends on||80448

-- 
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: formula/source include/formula

2014-07-08 Thread Kohei Yoshida

 formula/source/ui/dlg/formula.cxx |4 
 include/formula/formula.hxx   |3 +++
 2 files changed, 7 insertions(+)

New commits:
commit 3fdd4f069d5436cf39708004af7fda8175fbc4c2
Author: Kohei Yoshida 
Date:   Tue Jul 8 22:44:11 2014 -0400

Explicit virtual dtor needed for auto_ptr member for MSVC.

Else it won't build.

Change-Id: I6d857ffc7a444abaf477ee820e577757287a707c

diff --git a/formula/source/ui/dlg/formula.cxx 
b/formula/source/ui/dlg/formula.cxx
index b4fc563..3377565 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -1654,6 +1654,8 @@ FormulaModalDialog::FormulaModalDialog( Window* pParent
 SetText(m_pImpl->aTitle1);
 }
 
+FormulaModalDialog::~FormulaModalDialog() {}
+
 void FormulaModalDialog::Update(const OUString& _sExp)
 {
 m_pImpl->Update(_sExp);
@@ -1738,6 +1740,8 @@ FormulaDlg::FormulaDlg( SfxBindings* pB, SfxChildWindow* 
pCW,
 SetText(m_pImpl->aTitle1);
 }
 
+FormulaDlg::~FormulaDlg() {}
+
 void FormulaDlg::Update(const OUString& _sExp)
 {
 m_pImpl->Update(_sExp);
diff --git a/include/formula/formula.hxx b/include/formula/formula.hxx
index 28ecc1e..6aa3f4d 100644
--- a/include/formula/formula.hxx
+++ b/include/formula/formula.hxx
@@ -56,6 +56,8 @@ public:
 , bool _bSupportMatrix
 ,IFunctionManager* _pFunctionMgr
 ,IControlReferenceHandler* _pDlg = 
NULL );
+virtual ~FormulaModalDialog();
+
 private:
 SAL_WNODEPRECATED_DECLARATIONS_PUSH
 ::std::auto_ptr m_pImpl;
@@ -95,6 +97,7 @@ public:
 , bool _bSupportMatrix
 , IFunctionManager* _pFunctionMgr
 , IControlReferenceHandler* _pDlg = NULL );
+virtual ~FormulaDlg();
 private:
 SAL_WNODEPRECATED_DECLARATIONS_PUSH
 ::std::auto_ptr m_pImpl;
___
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' - translations

2014-07-08 Thread Christian Lohmaier

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

New commits:
commit 7d85872630828fb3c1c00570733ca07dd5e4c4fc
Author: Christian Lohmaier 
Date:   Tue Jul 8 23:00:18 2014 +0200

Updated core
Project: translations  ade9b0b52531db428b25b36dc3e3bfcfe880a06d

diff --git a/translations b/translations
index 939713e..ade9b0b 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 939713e6d30880089c0399c267fd998fa1954419
+Subproject commit ade9b0b52531db428b25b36dc3e3bfcfe880a06d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-07-08 Thread Michael Stahl

 solenv/gbuild/AutoInstall.mk |   34 +++---
 1 file changed, 27 insertions(+), 7 deletions(-)

New commits:
commit 13a3364bad27d19eb09c4f9357e0a9758eba7f61
Author: Michael Stahl 
Date:   Tue Jul 8 23:24:36 2014 +0200

gbuild: AutoInstall: fix the command line for Win32 make

Replace one ugly way with a different ugly way; it looks like the
make_define invocation did not actually work before.

Change-Id: Idd365f82a6fabab971ac88f91d81476bf124

diff --git a/solenv/gbuild/AutoInstall.mk b/solenv/gbuild/AutoInstall.mk
index c6b33f9..60e628f 100644
--- a/solenv/gbuild/AutoInstall.mk
+++ b/solenv/gbuild/AutoInstall.mk
@@ -16,6 +16,20 @@ echo "$(lastword $(1))" >> $@;
 echo "" >> $@
 endef
 
+define gb_AutoInstall__gen_define
+$(file >>$@,#define auto_$*_ALL \)
+$(foreach binary,$(filter-out $(lastword $(1)),$(1)),$(file >>$@,\
+   $(subst .,_,$(subst -,_,$(binary))), \))
+$(file >>$@,\
+   $(lastword $(1)))
+
+endef
+
+define gb_AutoInstall__gen_lib
+$(SCP2LIBTEMPLATE)(auto_$*_lib_$(1),$(call 
gb_Library_get_runtime_filename,$(1))$(if 
$(SCP2COMPONENTCONDITION),$(COMMA)$(SCP2COMPONENTCONDITION)))
+
+endef
+
 $(dir $(call gb_AutoInstall_get_target,%)).dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
@@ -23,6 +37,7 @@ $(call gb_AutoInstall_get_target,%) : 
$(GBUILDDIR)/AutoInstall.mk \
$(SRCDIR)/Repository.mk $(SRCDIR)/RepositoryExternal.mk \
$(BUILDDIR)/config_host.mk
$(call gb_Output_announce,$*,$(true),AIN,3)
+ifeq ($(HAVE_GNUMAKE_FILE_FUNC),)
echo "/* autogenerated installs for group $* */" > $@
$(call gb_AutoInstall__make_define,\
$(foreach lib,$(gb_Library_MODULE_$*),auto_$*_lib_$(lib)) \
@@ -30,13 +45,18 @@ $(call gb_AutoInstall_get_target,%) : 
$(GBUILDDIR)/AutoInstall.mk \
$(foreach exe,$(gb_Executable_MODULE_$*),auto_$*_exe_$(exe)) \
$(foreach jar,$(gb_Jar_MODULE_$*),auto_$*_jar_$(jar)) \
$(foreach pkg,$(gb_Package_MODULE_$*),auto_$*_pkg_$(pkg)))
-   # ugly hack for Win32 8k command line length limit
-   $(foreach lib,$(wordlist 1,70,$(gb_Library_MODULE_$*)),\
-   echo '$(SCP2LIBTEMPLATE)(auto_$*_lib_$(lib),$(call 
gb_Library_get_runtime_filename,$(lib))$(if 
$(SCP2COMPONENTCONDITION),$(COMMA)$(SCP2COMPONENTCONDITION)))' >> $@ &&) true
-   $(foreach lib,$(wordlist 71,140,$(gb_Library_MODULE_$*)),\
-   echo '$(SCP2LIBTEMPLATE)(auto_$*_lib_$(lib),$(call 
gb_Library_get_runtime_filename,$(lib))$(if 
$(SCP2COMPONENTCONDITION),$(COMMA)$(SCP2COMPONENTCONDITION)))' >> $@ &&) true
-   $(foreach lib,$(wordlist 141,,$(gb_Library_MODULE_$*)),\
-   echo '$(SCP2LIBTEMPLATE)(auto_$*_lib_$(lib),$(call 
gb_Library_get_runtime_filename,$(lib))$(if 
$(SCP2COMPONENTCONDITION),$(COMMA)$(SCP2COMPONENTCONDITION)))' >> $@ &&) true
+   $(foreach lib,$(gb_Library_MODULE_$*),\
+   echo '$(SCP2LIBTEMPLATE)(auto_$*_lib_$(lib),$(call 
gb_Library_get_runtime_filename,$(lib))$(if 
$(SCP2COMPONENTCONDITION),$(COMMA)$(SCP2COMPONENTCONDITION)))' >> $@;)
+else
+   $(file >$@,/* autogenerated installs for group $* */)
+   $(call gb_AutoInstall__gen_define,\
+   $(foreach lib,$(gb_Library_MODULE_$*),auto_$*_lib_$(lib)) \
+   $(foreach 
lib,$(gb_SdkLinkLibrary_MODULE_$*),auto_$*_link_$(lib)) \
+   $(foreach exe,$(gb_Executable_MODULE_$*),auto_$*_exe_$(exe)) \
+   $(foreach jar,$(gb_Jar_MODULE_$*),auto_$*_jar_$(jar)) \
+   $(foreach pkg,$(gb_Package_MODULE_$*),auto_$*_pkg_$(pkg)))
+   $(file >>$@,$(foreach lib,$(gb_Library_MODULE_$*),$(call 
gb_AutoInstall__gen_lib,$(lib
+endif
$(foreach lib,$(gb_SdkLinkLibrary_MODULE_$*),\
echo 'SDK_LIBRARY_LINK(auto_$*_link_$(lib),$(notdir $(call 
gb_Library_get_sdk_link_lib,$(lib))),../../ure-link/lib/$(call 
gb_Library_get_runtime_filename,$(lib)))' >> $@;)
$(foreach exe,$(gb_Executable_MODULE_$*),\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - config_host.mk.in configure.ac solenv/bin solenv/gbuild

2014-07-08 Thread Norbert Thiebaud

 config_host.mk.in   |2 
 configure.ac|  186 +---
 solenv/bin/modules/installer/control.pm |3 
 solenv/bin/modules/installer/environment.pm |2 
 solenv/gbuild/gbuild.mk |2 
 5 files changed, 96 insertions(+), 99 deletions(-)

New commits:
commit 27c6cf1d757d824b158e94258856a760ecf41a18
Author: Norbert Thiebaud 
Date:   Tue Jul 8 22:48:36 2014 +0200

cosmetic: fix few intentations irregularities

Change-Id: I3154e79cf43b836c46512575834ed8a99b56c912

diff --git a/configure.ac b/configure.ac
index 16c0cca..7be9bd2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -384,9 +384,9 @@ if test -n "$with_android_ndk"; then
 esac
 
 if test $host_cpu = arm; then
-   android_gnu_prefix=arm-linux-androideabi
+android_gnu_prefix=arm-linux-androideabi
 elif test $host_cpu = mips; then
-   android_gnu_prefix=mipsel-linux-android
+android_gnu_prefix=mipsel-linux-android
 elif test $ANDROID_NDK_VERSION = r8; then
 # The prefix used for the x86 tool-chain changed between NDK r8 and r8b
 android_gnu_prefix=i686-android-linux
@@ -2214,9 +2214,9 @@ dnl Do we want to use pre-build binary tarball for 
recompile
 dnl ===
 
 if test "$enable_library_bin_tar" = "yes" ; then
-   USE_LIBRARY_BIN_TAR=TRUE
+USE_LIBRARY_BIN_TAR=TRUE
 else
-   USE_LIBRARY_BIN_TAR=
+USE_LIBRARY_BIN_TAR=
 fi
 AC_SUBST(USE_LIBRARY_BIN_TAR)
 
@@ -3459,8 +3459,8 @@ AC_SUBST(COM_GCC_IS_CLANG)
 
 if test "$CCACHE" != "" -a "$COM_GCC_IS_CLANG" = TRUE; then
 if test -z "$CCACHE_CPP2"; then
-AC_MSG_WARN([Using ccache with Clang without CCACHE_CPP2 set 
causes spurious warnings.])
-add_warning "Using ccache with Clang without CCACHE_CPP2 set 
causes spurious warnings."
+AC_MSG_WARN([Using ccache with Clang without CCACHE_CPP2 set causes 
spurious warnings.])
+add_warning "Using ccache with Clang without CCACHE_CPP2 set causes 
spurious warnings."
 fi
 fi
 
@@ -3811,7 +3811,6 @@ if test "$_os" = "WINNT"; then
 COMEX=13
 WINDOWS_SDK_ACCEPTABLE_VERSIONS="7.1A 7.1 7.0A 6.0A"
 if test "$ENABLE_LTO" = TRUE; then
-
 AC_MSG_WARN([LTO is known to cause problems with MSVC 
2010])
 add_warning "LTO is known to cause problems with MSVC 2010"
 fi
@@ -5213,13 +5212,13 @@ else
 # Find out which modules are missing.
 missing_perl_modules=
 if ! `$PERL -e 'use Archive::Zip;'>/dev/null 2>&1`; then
-   missing_perl_modules=Archive::Zip
+missing_perl_modules=Archive::Zip
 fi
 if ! `$PERL -e 'use Cwd;'>/dev/null 2>&1`; then
-   missing_perl_modules="$missing_perl_modules Cwd"
+missing_perl_modules="$missing_perl_modules Cwd"
 fi
 if ! `$PERL -e 'use Digest::MD5;'>/dev/null 2>&1`; then
-   missing_perl_modules="$missing_perl_modules Digest::MD5"
+missing_perl_modules="$missing_perl_modules Digest::MD5"
 fi
AC_MSG_ERROR([
 The missing Perl modules are: $missing_perl_modules
@@ -5546,7 +5545,7 @@ if test "$GXX" = "yes"; then
 glibcxx_threads=yes],[AC_MSG_RESULT([no])])
 AC_LANG_POP([C++])
 if test $glibcxx_threads = yes; then
-  BOOST_CXXFLAGS="-D_GLIBCXX_HAS_GTHREADS"
+BOOST_CXXFLAGS="-D_GLIBCXX_HAS_GTHREADS"
 fi
  fi
 fi
@@ -5745,11 +5744,11 @@ dnl 
===
 # We need at least the sys/sdt.h include header.
 AC_CHECK_HEADER([sys/sdt.h], [SDT_H_FOUND='TRUE'], [SDT_H_FOUND='FALSE'])
 if test "$SDT_H_FOUND" = "TRUE"; then
-  # Found sys/sdt.h header, now make sure the c++ compiler works.
-  # Old g++ versions had problems with probes in constructors/destructors.
-  AC_MSG_CHECKING([working sys/sdt.h and c++ support])
-  AC_LANG_PUSH([C++])
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+# Found sys/sdt.h header, now make sure the c++ compiler works.
+# Old g++ versions had problems with probes in constructors/destructors.
+AC_MSG_CHECKING([working sys/sdt.h and c++ support])
+AC_LANG_PUSH([C++])
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #include 
 class ProbeClass
 {
@@ -5774,14 +5773,14 @@ if test "$SDT_H_FOUND" = "TRUE"; then
 DTRACE_PROBE2(_test_, dest, name, ref);
   }
 };
-  ]],[[
+]],[[
 int i = 64;
 DTRACE_PROBE1(_test_, call, i);
 ProbeClass inst = ProbeClass(i, "call");
 inst.method(24);
-  ]])], [AC_MSG_RESULT([yes]); AC_DEFINE([USE_SDT_PROBES])],
-[AC_MSG_RESULT([no, sdt.h or c++ compiler too old])])
-  AC_LANG_POP([C++])
+]])], [AC_MSG_RESULT([yes]); AC_DEFINE([USE_SDT_PROBES])],
+  [AC_MSG_RESULT([no, sdt.h or c++ compiler too old])])
+AC_LANG_POP([C++])
 fi
 AC_CONFIG_HEADERS([config_host/config_probes.

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-colors' - vcl/source

2014-07-08 Thread Krisztian Pinter

 vcl/source/app/settings.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2cad71fde0f56f8e571669d84ff39a6cbf395051
Author: Krisztian Pinter 
Date:   Tue Jul 8 22:38:42 2014 +0200

Reduce ColorValueSetMaximumRowCount to 20 from 40

Change-Id: Id37698c20e5ded3034b62b753d25964541643fd7

diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 4174d5a..bfa87b3 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -546,7 +546,7 @@ ImplStyleData::ImplStyleData() :
 maEdgeBlendingBottomRightColor = RGB_COLORDATA(0x40, 0x40, 0x40);
 mnListBoxMaximumLineCount = 25;
 mnColorValueSetColumnCount = 12;
-mnColorValueSetMaximumRowCount = 40;
+mnColorValueSetMaximumRowCount = 20;
 maListBoxPreviewDefaultLogicSize = Size(15, 7);
 maListBoxPreviewDefaultPixelSize = Size(0, 0); // on-demand calculated in 
GetListBoxPreviewDefaultPixelSize()
 mnListBoxPreviewDefaultLineWidth = 1;
___
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' - 87/637364387e5fd87d3b880ce230caa053ec555d

2014-07-08 Thread Caolán McNamara

 87/637364387e5fd87d3b880ce230caa053ec555d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 351377b3f78c1a83f361eab4ba8c9c8d642ff8be
Author: CaolÃ¡n McNamara 
Date:   Tue Jul 8 20:50:02 2014 +0100

Notes added by 'git notes add'

diff --git a/87/637364387e5fd87d3b880ce230caa053ec555d 
b/87/637364387e5fd87d3b880ce230caa053ec555d
new file mode 100644
index 000..3a7bcff
--- /dev/null
+++ b/87/637364387e5fd87d3b880ce230caa053ec555d
@@ -0,0 +1 @@
+merged as: 25deea83f38804504b7b275a201d47e4e243f8fc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - formula/source include/formula reportdesign/inc svx/source

2014-07-08 Thread Caolán McNamara

 formula/source/ui/dlg/formdlgs.src |  165 -
 formula/source/ui/dlg/formula.cxx  |   24 +
 formula/source/ui/inc/ForResId.hrc |3 
 include/formula/formula.hxx|2 
 reportdesign/inc/helpids.hrc   |4 
 svx/source/svdraw/svdfmtf.cxx  |   33 ---
 svx/source/svdraw/svdfmtf.hxx  |5 -
 7 files changed, 31 insertions(+), 205 deletions(-)

New commits:
commit 005ed48e70114e1f7edee76ca514049895df27bd
Author: CaolÃ¡n McNamara 
Date:   Tue Jul 8 16:44:10 2014 +0100

drop unused helpids

Change-Id: I43c8e1327731796498c6da42179ff085c26279b9

diff --git a/reportdesign/inc/helpids.hrc b/reportdesign/inc/helpids.hrc
index 69a581a..3abc428 100644
--- a/reportdesign/inc/helpids.hrc
+++ b/reportdesign/inc/helpids.hrc
@@ -41,10 +41,6 @@
 #define HID_RPT_SORTORDER 
"REPORTDESIGN_HID_RPT_SORTORDER"
 #define HID_RPT_GROUPSBRW 
"REPORTDESIGN_HID_RPT_GROUPSBRW"
 #define HID_RPT_GROUPSSORTING_DLG 
"REPORTDESIGN_HID_RPT_GROUPSSORTING_DLG"
-#define HID_RPT_CONDFORMAT_DLG
"REPORTDESIGN_HID_RPT_CONDFORMAT_DLG"
-#define HID_RPT_CONDFORMAT_TB 
"REPORTDESIGN_HID_RPT_CONDFORMAT_TB"
-#define HID_RPT_CRTL_FORMAT_PREVIEW   
"REPORTDESIGN_HID_RPT_CRTL_FORMAT_PREVIEW"
-#define HID_RPT_COND_DLG  
"REPORTDESIGN_HID_RPT_COND_DLG"
 #define HID_RPT_POPUP_COLOR_CTRL  
"REPORTDESIGN_HID_RPT_POPUP_COLOR_CTRL"
 #define HID_RPT_POPUP_COLOR   
"REPORTDESIGN_HID_RPT_POPUP_COLOR"
 #define HID_RPT_FIELD_SEL 
"REPORTDESIGN_HID_RPT_FIELD_SEL"
commit a86d511c1f4e0f006697edfcfaff1821c524afdf
Author: CaolÃ¡n McNamara 
Date:   Tue Jul 8 16:32:21 2014 +0100

trivial conversion of RID_FORMULADLG_FORMULA_MODAL to .ui

Change-Id: I25f29821079cf4fa4759daffe78bec8c4b48abbc

diff --git a/formula/source/ui/dlg/formdlgs.src 
b/formula/source/ui/dlg/formdlgs.src
index 91bee16..ee99d15 100644
--- a/formula/source/ui/dlg/formdlgs.src
+++ b/formula/source/ui/dlg/formdlgs.src
@@ -57,171 +57,6 @@ String STR_STRUCT_ERR2
 Text [ en-US ] = "Error" ;
 };
 
-ModalDialog RID_FORMULADLG_FORMULA_MODAL
-{
-SVLook = TRUE ;
-Size = MAP_APPFONT ( 321 , 228 ) ;
-Moveable = TRUE ;
-TabControl TC_FUNCTION
-{
-HelpID = "formula:TabControl:RID_FORMULADLG_FORMULA_MODAL:TC_FUNCTION";
-Pos = MAP_APPFONT ( 6 , 5 ) ;
-Size = MAP_APPFONT ( 102 , 199 ) ;
-PageList =
-{
-PageItem
-{
-Identifier = TP_FUNCTION ;
-Text [ en-US ] = "Functions" ;
-};
-PageItem
-{
-Identifier = TP_STRUCT ;
-Text [ en-US ] = "Structure" ;
-};
-};
-};
-FixedText FT_HEADLINE
-{
-Pos = MAP_APPFONT ( 115 , 24 ) ;
-Size = MAP_APPFONT ( 194 , 8 ) ;
-WordBreak = TRUE ;
-};
-FixedText FT_FUNCNAME
-{
-Pos = MAP_APPFONT ( 115 , 38 ) ;
-Size = MAP_APPFONT ( 194 , 24 ) ;
-WordBreak = TRUE ;
-};
-FixedText FT_FUNCDESC
-{
-Pos = MAP_APPFONT ( 115 , 68 ) ;
-Size = MAP_APPFONT ( 194 , 64 ) ;
-WordBreak = TRUE ;
-};
-FixedText FT_EDITNAME
-{
-Pos = MAP_APPFONT ( 113 , 6 ) ;
-Size = MAP_APPFONT ( 83 , 10 ) ;
-};
-GroupBox GB_EDIT
-{
-Pos = MAP_APPFONT ( 112 , 18 ) ;
-Size = MAP_APPFONT ( 203 , 128 ) ;
-};
-FixedText FT_FORMULA
-{
-Pos = MAP_APPFONT ( 112 , 151 ) ;
-Size = MAP_APPFONT ( 50 , 10 ) ;
-WordBreak = TRUE ;
-Text [ en-US ] = "For~mula" ;
-};
-Control ED_FORMULA
-{
-Border = TRUE ;
-Pos = MAP_APPFONT ( 112 , 161 ) ;
-Size = MAP_APPFONT ( 203 , 43 ) ;
-};
-FixedText FT_RESULT
-{
-Pos = MAP_APPFONT ( 198 , 6 ) ;
-Size = MAP_APPFONT ( 55 , 10 ) ;
-Right = TRUE ;
-Text [ en-US ] = "Function result" ;
-};
-FixedText WND_RESULT
-{
-Border = TRUE ;
-Pos = MAP_APPFONT ( 255 , 4 ) ;
-Size = MAP_APPFONT ( 60 , 12 ) ;
-Text [ en-US ] = "Function result" ;
-};
-FixedText FT_FORMULA_RESULT
-{
-Pos = MAP_APPFONT ( 217 , 149 ) ;
-Size = MAP_APPFONT ( 35 , 10 ) ;
-Text [ en-US ] = "Result" ;
-Right = TRUE ;
-};
-Window WND_FORMULA_RESULT
-{
-Border = TRUE ;
-Pos = MAP_APPFONT ( 255 , 147 ) ;
-Size = MAP_APPFONT ( 60 , 12 ) ;
-};
-CheckBox BTN_MATRIX
-{
-HelpID = "formula:CheckBox:RID_FORMULADLG_FORMULA_MODAL:BTN_MATRIX";
-Pos = MAP_APPFONT ( 6 , 208 ) ;
-Size = MAP_APPFONT ( 50 , 10 ) ;
-TabStop = TRUE ;
-Text [ en-US ] = "Array" ;
-};
-Edit ED_REF

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

2014-07-08 Thread Douglas Mencken

 configure.ac |   21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

New commits:
commit 08abec41d682e67670f1f60aa71e6fd8bf81a927
Author: Douglas Mencken 
Date:   Tue Jul 8 13:22:03 2014 -0400

Bump build-time system python's requirement to 2.6.

"Writing Python code that is OK on 2.x and 3.x is next to impossible
when 2.x is 2.5" --Miklos Vajna

Change-Id: I432c2773eb60ab3bd5cc907407ca5159ce4390ad
Reviewed-on: https://gerrit.libreoffice.org/10116
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/configure.ac b/configure.ac
index efe0bf4..e5153ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1059,7 +1059,7 @@ AC_ARG_ENABLE(python,
 [Enables or disables Python support at run-time and build-time.
  Also specifies what Python to use. 'auto' is the default.
  'fully-internal' even forces the internal version for uses of Python
- during the build (for testing purposes, mainly).]))
+ during the build.]))
 
 AC_ARG_ENABLE(gtk,
 AS_HELP_STRING([--disable-gtk],
@@ -8023,14 +8023,14 @@ AC_SUBST(LIBXML_LIBS)
 AC_SUBST(XMLLINT)
 
 # =
-# Checking for a Python interpreter with version >= 2.5 needed to build LO.
-# runtime requires Python 3 compatible version (>= 2.6)
+# Checking for a Python interpreter with version >= 2.6.
+# Build and runtime requires Python 3 compatible version (>= 2.6).
 # Optionally user can pass an option to configure, i. e.
 # ./configure PYTHON=/usr/bin/python
 # =
 if test "$build_os" != "cygwin" -a "$enable_python" != fully-internal; then
 # This allows a lack of system python with no error, we use internal one 
in that case.
-AM_PATH_PYTHON([2.5],, [:])
+AM_PATH_PYTHON([2.6],, [:])
 # Clean PYTHON_VERSION checked below if cross-compiling
 PYTHON_VERSION=""
 if test "$PYTHON" != ":"; then
@@ -8073,8 +8073,12 @@ no|disable)
 # we actually do check anew.
 unset PYTHON am_cv_pathless_PYTHON ac_cv_path_PYTHON 
am_cv_python_version am_cv_python_platform am_cv_python_pythondir 
am_cv_python_pyexecdir
 AM_PATH_PYTHON([3.3],, [:])
-if test "$PYTHON" = :; then
-AC_MSG_RESULT([internal])
+if test "$PYTHON" = ":"; then
+if test -z "$PYTHON_FOR_BUILD"; then
+AC_MSG_RESULT([fully internal])
+else
+AC_MSG_RESULT([internal])
+fi
 enable_python=internal
 else
 AC_MSG_RESULT([system])
@@ -8103,9 +8107,6 @@ fi
 
 if test $enable_python = system; then
 if test -z "$PYTHON_CFLAGS" -a $_os = Darwin; then
-# We already have logic above to make sure the system Python
-# is used only when building against SDK 10.6 or newer.
-
 # Make sure we use the 2.6 Python when building against the
 # 10.6 SDK.
 case $with_macosx_sdk in
@@ -8114,7 +8115,7 @@ if test $enable_python = system; then
 10.7|10.8)
 python_version=2.7;;
 *)
-# ???
+# 10.9 etc.
 python_version=2.7;;
 esac
 PYTHON=python$python_version
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-colors' - 2 commits - cui/source include/svx svx/source

2014-07-08 Thread Krisztian Pinter

 cui/source/tabpages/tpcolor.cxx|   11 +++
 include/svx/PaletteManager.hxx |7 
 include/svx/tbcontrl.hxx   |2 -
 svx/source/tbxctrls/PaletteManager.cxx |   31 +++-
 svx/source/tbxctrls/colorwindow.hxx|2 +
 svx/source/tbxctrls/tbcontrl.cxx   |   51 +
 6 files changed, 77 insertions(+), 27 deletions(-)

New commits:
commit 9434885f2f3f0cc6f58a5c28d81b665759fca034
Author: Krisztian Pinter 
Date:   Tue Jul 8 19:08:38 2014 +0200

Add color picker to color palette

Change-Id: I651f485598ee57af815780e234031f101b63fa24

diff --git a/include/svx/PaletteManager.hxx b/include/svx/PaletteManager.hxx
index a6b2dfa..e1d7201 100644
--- a/include/svx/PaletteManager.hxx
+++ b/include/svx/PaletteManager.hxx
@@ -21,6 +21,7 @@
 
 #include 
 #include 
+#include 
 
 class PaletteManager
 {
@@ -28,7 +29,9 @@ class PaletteManager
 sal_uInt16  mnCurrentPalette;
 
 longmnColorCount;
+svx::ToolboxButtonColorUpdater* mpBtnUpdater;
 
+Color   mLastColor;
 std::vector maPalettes;
 public:
 PaletteManager();
@@ -38,6 +41,10 @@ public:
 voidNextPalette();
 longGetColorCount();
 OUStringGetPaletteName();
+const Color& GetLastColor();
+voidSetLastColor(const Color& rLastColor);
+voidSetBtnUpdater(svx::ToolboxButtonColorUpdater* pBtnUpdater);
+voidPopupColorPicker();
 };
 
 #endif // INCLUDED_SVX_PALETTEMANAGER_HXX
diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx
index 1e9c4b1..762f33d 100644
--- a/include/svx/tbcontrl.hxx
+++ b/include/svx/tbcontrl.hxx
@@ -221,7 +221,6 @@ class SVX_DLLPUBLIC SvxColorToolBoxControl : public 
SfxToolBoxControl
 using SfxToolBoxControl::StateChanged;
 
 ::boost::scoped_ptr< ::svx::ToolboxButtonColorUpdater > pBtnUpdater;
-Color   mLastColor;
 PaletteManager  mPaletteManager;
 DECL_LINK( SelectedHdl, Color* );
 public:
@@ -242,7 +241,6 @@ public:
 class SVX_DLLPUBLIC SvxLineColorToolBoxControl : public SfxToolBoxControl
 {
 ::boost::scoped_ptr< ::svx::ToolboxButtonColorUpdater > pBtnUpdater;
-Color   mLastColor;
 PaletteManager  mPaletteManager;
 DECL_LINK( SelectedHdl, Color* );
 public:
diff --git a/svx/source/tbxctrls/PaletteManager.cxx 
b/svx/source/tbxctrls/PaletteManager.cxx
index 88916ee..e9933d4 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -23,11 +23,13 @@
 #include 
 #include "svx/drawitem.hxx"
 #include 
+#include 
 
 PaletteManager::PaletteManager() :
 mnNumOfPalettes(2),
 mnCurrentPalette(0),
-mnColorCount(0)
+mnColorCount(0),
+mLastColor(COL_AUTO)
 {
 LoadPalettes();
 mnNumOfPalettes += maPalettes.size();
@@ -127,4 +129,31 @@ OUString PaletteManager::GetPaletteName()
 return OStringToOUString(maPalettes[mnCurrentPalette - 
1].GetPaletteName(), RTL_TEXTENCODING_ASCII_US);
 }
 
+const Color& PaletteManager::GetLastColor()
+{
+return mLastColor;
+}
+
+void PaletteManager::SetLastColor(const Color& rLastColor)
+{
+mLastColor = rLastColor;
+}
+
+void PaletteManager::SetBtnUpdater(svx::ToolboxButtonColorUpdater* pBtnUpdater)
+{
+mpBtnUpdater = pBtnUpdater;
+}
+
+void PaletteManager::PopupColorPicker()
+{
+SvColorDialog aColorDlg( 0 );
+aColorDlg.SetColor ( mLastColor );
+aColorDlg.SetMode( svtools::ColorPickerMode_MODIFY );
+if( aColorDlg.Execute() == RET_OK )
+{
+mpBtnUpdater->Update( aColorDlg.GetColor() );
+mLastColor = aColorDlg.GetColor();
+}
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/tbxctrls/colorwindow.hxx 
b/svx/source/tbxctrls/colorwindow.hxx
index 3e19796..fe8fe8d 100644
--- a/svx/source/tbxctrls/colorwindow.hxx
+++ b/svx/source/tbxctrls/colorwindow.hxx
@@ -44,6 +44,7 @@ private:
 SvxColorValueSet aColorSet;
 PushButton aButtonLeft;
 PushButton aButtonRight;
+PushButton aButtonPicker;
 FixedText  aPaletteName;
 OUString  maCommand;
 Link maSelectedLink;
@@ -57,6 +58,7 @@ private:
 DECL_LINK( SelectHdl, void * );
 DECL_LINK( StepLeftClickHdl, void * );
 DECL_LINK( StepRightClickHdl, void * );
+DECL_LINK( OpenPickerClickHdl, void * );
 
 protected:
 virtual voidResize() SAL_OVERRIDE;
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index d13d2ca..f2141f4 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1086,6 +1086,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& 
   rCommand,
 aColorSet   ( this, WinBits( WB_ITEMBORDER | WB_NAMEFIELD | WB_3DLOOK | 
WB_NO_DIRECTSELECT) ),
 aButtonLeft ( this ),
 aButtonRight( this ),
+aButtonPicker( this ),
 aPaletteName( this ),
 maCommand( rCommand

Jan-Henrik Bruhn license statement

2014-07-08 Thread Jan-Henrik Bruhn

As I’m planning to contribute to this great project, here’s my license 
statement:

All of my past & future contributions to LibreOffice may be licensed under the 
MPLv2/LGPLv3+ dual license.

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

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-personas' - 2 commits - cui/source cui/uiconfig

2014-07-08 Thread Rachit Gupta

 cui/source/options/personalization.cxx |3 +++
 cui/source/options/personalization.hxx |1 +
 cui/uiconfig/ui/personalization_tab.ui |9 -
 3 files changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 53b5adcbc8c03a6ec15d9abdf4ae3136315d569b
Author: Rachit Gupta 
Date:   Tue Jul 8 22:09:30 2014 +0530

The "Select personas installed via extensions" label is invisible by 
default.

The label is not shown if there are no persona extensions installed.

Change-Id: I758bb7ff7f22d56bfb7fe212908f9f5f1f3e7979

diff --git a/cui/source/options/personalization.cxx 
b/cui/source/options/personalization.cxx
index 69afe39..e67318a 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -250,6 +250,8 @@ SvxPersonalizationTabPage::SvxPersonalizationTabPage( 
Window *pParent, const Sfx
 
 get( m_pExtensionPersonaPreview, "persona_preview" );
 
+get ( m_pExtensionLabel, "extensions_label" );
+
 LoadDefaultImages();
 LoadExtensionThemes();
 }
@@ -371,6 +373,7 @@ void SvxPersonalizationTabPage::LoadExtensionThemes()
 return;
 
 m_pPersonaList->Show();
+m_pExtensionLabel->Show();
 
 for( sal_Int32 nIndex = 0; nIndex < nLength; nIndex++ )
 {
diff --git a/cui/source/options/personalization.hxx 
b/cui/source/options/personalization.hxx
index e3f40c6..a09226e 100644
--- a/cui/source/options/personalization.hxx
+++ b/cui/source/options/personalization.hxx
@@ -33,6 +33,7 @@ private:
 PushButton *m_pExtensionPersonaPreview; ///< Buttons to show the last 
3 personas installed via extensions
 ListBox* m_pPersonaList;///< The ListBox to show the 
list of installed personas
 OUString m_aPersonaSettings;///< Header and footer images 
+ color to be set in the settings.
+FixedText *m_pExtensionLabel;   ///< The "select persona 
installed via extensions" label
 
 std::vector m_vDefaultPersonaSettings;
 std::vector m_vExtensionPersonaSettings;
diff --git a/cui/uiconfig/ui/personalization_tab.ui 
b/cui/uiconfig/ui/personalization_tab.ui
index c76e00f..f288a90 100644
--- a/cui/uiconfig/ui/personalization_tab.ui
+++ b/cui/uiconfig/ui/personalization_tab.ui
@@ -151,8 +151,7 @@
   
 
 
-  
-True
+  
 False
 0
 Or, select from 
the personas installed via extensions
commit f28e4bd999efc5ea2bd76b2a921efc9f89a50c7c
Author: Rachit Gupta 
Date:   Tue Jul 8 21:53:28 2014 +0530

Improved UI: Large buttons are not shown.

* In the Personalization Tab Page, the button sizes are not affected
  by the presence of the preview buttons. THey remain their original
  size.
* Added some padding and spacing to avoid cluttering of the widgets.

Change-Id: Iea919b9fbfce4a7bfc82f73ccb49f94aa10ec804

diff --git a/cui/uiconfig/ui/personalization_tab.ui 
b/cui/uiconfig/ui/personalization_tab.ui
index f19e1db..c76e00f 100644
--- a/cui/uiconfig/ui/personalization_tab.ui
+++ b/cui/uiconfig/ui/personalization_tab.ui
@@ -18,13 +18,14 @@
 True
 False
 6
+6
 12
+6
 
   
 True
 False
-2
-True
+12
 
   
 Plain look, do 
not use Themes
@@ -169,7 +170,6 @@
 6
 
   
-False
 True
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 41883] MinGW port Most Annoying Bugs

2014-07-08 Thread bugzilla-daemon

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

tommy27  changed:

   What|Removed |Added

 Status|RESOLVED|CLOSED
 CC||ba...@quipo.it

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

Gerrit upgrade

2014-07-08 Thread Alexander Werner

Due to an upgrade to gerrit it will be unavailable for a short time at around 
1615UTC.

Sorry for the inconveniences,
Alex
--
Alexander Werner 
Admin Team of The Document Foundation
The Document Foundation, Kurfürstendamm 188, 10707 Berlin
Rechtsfähige Stiftung des bürgerlichen Rechts
Legal details: http://www.documentfoundation.org/imprint







signature.asc
Description: Message signed with OpenPGP using GPGMail
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] dev-tools.git: scripts/Bugzilla.pm scripts/esc-bug-stats.pl

2014-07-08 Thread Michael Meeks

 scripts/Bugzilla.pm  |1 +
 scripts/esc-bug-stats.pl |   21 +
 2 files changed, 18 insertions(+), 4 deletions(-)

New commits:
commit 19dc302242d4731ccedf249fd06291aa15638ddb
Author: Michael Meeks 
Date:   Tue Jul 8 17:07:37 2014 +0100

Fix scripts for 4.4

diff --git a/scripts/Bugzilla.pm b/scripts/Bugzilla.pm
index 8ee0e58..8093c8b 100644
--- a/scripts/Bugzilla.pm
+++ b/scripts/Bugzilla.pm
@@ -57,6 +57,7 @@ my %sadly_non_libreoffice = (
 'Rex Dieter' => 1,
 'Tom Stellard' => 1,
 'almos' => 1,
+'Andreas Boll' => 1,
 );
 
 sub get_url($)
diff --git a/scripts/esc-bug-stats.pl b/scripts/esc-bug-stats.pl
index 872f9eb..508a95b 100755
--- a/scripts/esc-bug-stats.pl
+++ b/scripts/esc-bug-stats.pl
@@ -29,6 +29,7 @@ sub build_overall_bugstats()
 }
 
 my %bug_to_ver = (
+'4.4' => '79641',
 '4.3' => '75025',
 '4.2' => '65675',
 '4.1' => '60270',
@@ -196,6 +197,12 @@ print << "EOF"
   Closed 4.3
  
  
+  Open 4.4
+ 
+ 
+  Closed 4.4
+ 
+ 
   Total 3.5
  
  
@@ -214,6 +221,9 @@ print << "EOF"
   Total 4.3
  
  
+  Total 4.4
+ 
+ 
   Total Open
  
  
@@ -234,17 +244,20 @@ print << "EOF"
   
  
  
- 
+ 
  
- 
+ 
+ 
+ 
  
  
  
  
  
  
- 
- 
+ 
+ 
+ 
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[GSOC] Personas - Weekly Report #7

2014-07-08 Thread Rachit Gupta

Hello all,

This week, I achieved the following things:

+ Fixed a bug regarding Persona registry.
+ Changed the installation of Personas through extensions process. All the
installed personas are listed in a TreeView, and the selected persona is
previewed in a button and applied when user clicks OK.
+ The registry entries are cleared in case the installed extension is
removed.

My mentor, Kendy is not available for this week. So, I'll be working on a
few UI related tasks for the first part of the week, and focus on the tasks
given by my co-mentor, quikee, for the remainder of the week

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

[Bug 79641] LibreOffice 4.4 most annoying bugs

2014-07-08 Thread bugzilla-daemon

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

Michael Meeks  changed:

   What|Removed |Added

 Depends on||81058

-- 
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: include/connectivity

2014-07-08 Thread Caolán McNamara

 include/connectivity/CommonTools.hxx |   30 +-
 1 file changed, 25 insertions(+), 5 deletions(-)

New commits:
commit 6f092beb46796b8a6cc94b5f4cbe509bf541fae2
Author: CaolÃ¡n McNamara 
Date:   Tue Jul 8 16:43:16 2014 +0100

Revert "use SimpleReferenceObject in connectivity module"

turns out to be a bit tangled wrt copy construction

This reverts commit 48cc4f1b8cf06a8e56c12e659a71f72d609568cd.

diff --git a/include/connectivity/CommonTools.hxx 
b/include/connectivity/CommonTools.hxx
index 4199c9c..d099905 100644
--- a/include/connectivity/CommonTools.hxx
+++ b/include/connectivity/CommonTools.hxx
@@ -37,7 +37,6 @@
 #include 
 #include 
 #include 
-#include 
 
 namespace com { namespace sun { namespace star { namespace util {
 struct Date;
@@ -64,18 +63,19 @@ namespace connectivity
 typedef std::map OSQLTables;
 
 // class ORefVector allows reference counting on a std::vector
-template< class VectorVal > class ORefVector : public 
salhelper::SimpleReferenceObject
+template< class VectorVal > class ORefVector
 {
 std::vector< VectorVal > m_vector;
+oslInterlockedCount m_refCount;
 
 protected:
 virtual ~ORefVector(){}
 public:
 typedef std::vector< VectorVal > Vector;
 
-ORefVector() {}
-ORefVector(size_t _st) : m_vector(_st) {}
-ORefVector(const ORefVector& _rRH) : m_vector(_rRH.m_vector)
+ORefVector() : m_refCount(0) {}
+ORefVector(size_t _st) : m_vector(_st) , m_refCount(0) {}
+ORefVector(const ORefVector& _rRH) : 
m_vector(_rRH.m_vector),m_refCount(0)
 {
 }
 ORefVector& operator=(const ORefVector& _rRH)
@@ -89,6 +89,26 @@ namespace connectivity
 
 std::vector< VectorVal > & get() { return m_vector; }
 std::vector< VectorVal > const & get() const { return m_vector; }
+
+inline static void * SAL_CALL operator new( size_t nSize )
+{ return ::rtl_allocateMemory( nSize ); }
+inline static void SAL_CALL operator delete( void * pMem )
+{ ::rtl_freeMemory( pMem ); }
+inline static void * SAL_CALL operator new( size_t, void * pMem )
+{ return pMem; }
+inline static void SAL_CALL operator delete( void *, void * )
+{}
+
+void acquire()
+{
+osl_atomic_increment( &m_refCount );
+}
+void release()
+{
+if (! osl_atomic_decrement( &m_refCount ))
+delete this;
+}
+
 };
 
 // class ORowVector incudes refcounting and initialze himself
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2014-07-08 Thread Caolán McNamara

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

New commits:
commit d153301d0bb78a37ae03c1b95766cc074b72e0dd
Author: CaolÃ¡n McNamara 
Date:   Tue Jul 8 16:46:01 2014 +0100

Updated core
Project: help  900defa453aeb03e0d675d3860de5674786dd6cb

diff --git a/helpcontent2 b/helpcontent2
index e59cf1d..900defa 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e59cf1d627e4e71d9dc40d9e58d93f25b10875f5
+Subproject commit 900defa453aeb03e0d675d3860de5674786dd6cb
___
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

2014-07-08 Thread Caolán McNamara

 helpers/help_hid.lst |4 
 1 file changed, 4 deletions(-)

New commits:
commit 900defa453aeb03e0d675d3860de5674786dd6cb
Author: CaolÃ¡n McNamara 
Date:   Tue Jul 8 16:46:01 2014 +0100

drop unused helpids

Change-Id: Ib75f3b7f25b1abab3cb681f2cea9ca59bf0bbf63

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 8b1bdd0..1c7367f 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2525,10 +2525,6 @@ HID_RELATIONDIALOG_RIGHTFIELDCELL,38923,
 HID_REPORTSECTION,64457,
 HID_REPORT_NAVIGATOR_TREE,64521,
 HID_RETURN_TO_MAILMERGE,54989,
-HID_RPT_CONDFORMAT_DLG,64467,
-HID_RPT_CONDFORMAT_TB,64468,
-HID_RPT_COND_DLG,64470,
-HID_RPT_CRTL_FORMAT_PREVIEW,64469,
 HID_RPT_DATETIME_DLG,64466,
 HID_RPT_ENDMARKER,64455,
 HID_RPT_FIELDEXPRESSION,64461,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.2.5.2-hotfix1'

2014-07-08 Thread Christian Lohmaier

Tag 'libreoffice-4.2.5.2-hotfix1' created by Christian Lohmaier 
 at 2014-07-08 16:39 -0700

Tag libreoffice-4.2.5.2-hotfix1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJTvBC6AAoJEPQ0oe+v7q6jx5AP/RlgWrgEXv+LVsDm+dzCgrNe
LB927QsdpiqCx2CYBhHLqZ8OOE8TARwFZ/Cp0kYvsQ7MMdDBswQ0cmwKWMmjj4Ty
uuiysa7Vt4wPyIhiTJ0yWUYXlS7ppPyh4oDF4RzycvBvHo2uEAD7pPifnpCHp/N6
hsPk0qTH9c2Hsg/+ZW3rXqoXHuhxFswc8j+Y5bmQuF2rk8u1Am8bngPSUl5LVERK
m3eMkzjkctHaec4k0y/T9qYBEN+eFvGVR5YpFi0ZwHNNhJulrYEGYidcw4GXwCbJ
TOcPUNXyGatK0YaJIk7eeBHBup/sXsRgFFjycQHOJuoiZ9OIP8AJgZOdNt3P6pWa
5TgV+2RnelzLd+P+s4wq4yaQkLhqvGIZfLWltkvzKhCtjJfgjgpYmNe9FGRHt/GG
67o7gJB+pBRyv0R5rPI++KCrbknTcLEYQQnwzRK5JXvWK/iuIlg/j7bj7abjM+tm
zYhnJliwkUoYIEyF63wJY+4aGjXaOEjxZlHgB0Ub4Ff6GGKIQ70RjFyplcsWzuz3
7257/LpZR15FUXX7ybhtebAVpy0gWTz2I1XIZYrBcyJqik/V5Q6SDcShE2Z8KSE2
5KvHkfPRTVKPMGQ8gQrzQVAJuEjEAsfZbrmK9pzV0UFZMez2i5hH4PZqj3z1mtiK
plVJDi7IIEnLLJfI3qtI
=hox3
-END PGP SIGNATURE-

Changes since libreoffice-4.2.5.2-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.2.5.2-hotfix1'

2014-07-08 Thread Christian Lohmaier

Tag 'libreoffice-4.2.5.2-hotfix1' created by Christian Lohmaier 
 at 2014-07-08 16:39 -0700

Tag libreoffice-4.2.5.2-hotfix1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJTvBC3AAoJEPQ0oe+v7q6jtmgP/2fzLY3HKtobi83NneYkEBgu
UkIAwE560ayNZawFj3ocg4bQJwZwtS9DX+3enMKkTpPtOV4/wuwaPEYXOhSrTEkp
9Qv3WZbATR8NeAcWk9Boti5uDv8CFLr1OKi0s5063KtV4BjdE8pC+Mmll3qvQvNh
IFrKYdG6VJX4psnNv/EOi0tSWMc7xzqbFKLnvF/giJxBdRfVqWujfX/bbUOGDX8L
ZxYLKYEN/D7qtKzLBl1Nuuq/Ck8OubbrzimJuHja4tnVwrqGQpJ3/S53D6iy1F/N
84FCTUC8no1HTosdYn5+qcSG08elwCfuBtOoXRse488/VQHznXakzg9gbpN3ZYx9
oZ+8vOxhRftpL2g/SdiECiMsSu7EWPbJaQPimOm2W/oh5MID8ruAYGw8Q7iIzfh8
wx6IqC1P9bRxPFyt7k19K5rigWbJQcrGAUoyus/E/Jpgu4podVqw8YmsqI/cwz4q
6NCe2ondZVg9+pD3/wcjhgZVtpJ+t2U154GP8j92GxzB9h4AEq1yrm8604CIA0u5
SHuna4w3GEMKZFwWJZrHV+amRLwEvxtAGDAPN6zTLaSiqF9sDxyRIAguFabo2/KO
NH/cNz2hw9yasesmz4gKohQcTEqHr+chk1kqsbq50FlsPDmZOrvNKPfSfpLdCV+N
9XbilLmrFksslzpJnupB
=z2cN
-END PGP SIGNATURE-

Changes since libreoffice-4.2.5.2:
Christian Lohmaier (1):
  Version 4.2.5.2, tag libreoffice-4.2.5.2-hotfix1

---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.2.5.2-hotfix1'

2014-07-08 Thread Christian Lohmaier

Tag 'libreoffice-4.2.5.2-hotfix1' created by Christian Lohmaier 
 at 2014-07-08 16:39 -0700

Tag libreoffice-4.2.5.2-hotfix1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJTvBC0AAoJEPQ0oe+v7q6jhl0QAIvP/42UKY1rpAChDg/+/3v0
5Wq6xTAshh00rzerlJRgj3L0R/CRE+2C5PELcMUxCnWb6OODXwKbaEE6j6W4gI/V
sv3kmEfBgZRsYnjwK1lySNr8+YCtTupnmPzREVQvIKDuOOo8+dBTe/PRGfi+FDv5
nRgPAX7qiy3CqeZLQEAB6DcSCuIHl0Qo20R6tBxFBdpBAdQT6XAr/dxgPDc6lO0D
etbLqyB/0aSPX9E9yo221/8QNDlxvVbMW9EShABN2CDD3DGiQZ8lL2KBQNlnbPet
MLX4Pd3qoxZiSRrx+6RSQfjsjzgiS5MINzFS8v0IdvRiSdDKWWbeGcsqR96FaYd4
4UCigeLHLDrFoTs1n7O2NZPn1Tq/FjJHZE1fH+V+k2CWzvmvro9Og348qi8jw8u0
YGT9bylGRCKrjvlzybC7pca82sAOKCFR835lR324Cgf0YG2pv9shhn4MrM8+AV9P
vJjJs5gZjPuLn9W93MFtyCRV7WtKKUz+GTyPyQ9dnc6Mu/5VzOobxOANHHYbbVUi
ZLGJX852WfIHU8aFh4mIxYC+N+2Afmgn3Cgz+G9Mb+kteR7a9SVqNDHysJ6WT6rZ
KUWcr21W3398iLAwsY5tay2gR/K45VfTcHDPFVDxZLYUU2THECp+flTTRWpW5KGU
a/32mh+iXypNLOxqY3Vs
=L8zp
-END PGP SIGNATURE-

Changes since libreoffice-4.2.5.2:
Christian Lohmaier (1):
  Version 4.2.5.2, tag libreoffice-4.2.5.2-hotfix1

---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.2.5.2-hotfix1'

2014-07-08 Thread Christian Lohmaier

Tag 'libreoffice-4.2.5.2-hotfix1' created by Christian Lohmaier 
 at 2014-07-08 16:39 -0700

Tag libreoffice-4.2.5.2-hotfix1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJTvBCxAAoJEPQ0oe+v7q6jaCIP/1rdBqKKMrzmFN3Th774SHFX
OsIE8nRjHzDiZ1pYGW9j9jJVxkz2HRZ+3/tCK5nDv8K+UeDqFZwsqgR+XFIUKa4m
mZ9KZRPLtiIMLcNEhrbrn4rtogO6/x6K+XqwZeT3idRK+EkjXSJnAczOr7eqeDVU
31o6BH7dQkjE3eIbpS58iTotZiZfm7JQSce1/O7+zUJWys+8zPOHUl0MSb7PRlRe
nnrLDlhzbBWBlI1lLeHpU9f77HaSsCfQacWfS7Bs4NHetnrEQAH73hJBpusxB6Er
QYXgwgRXwRvk0OGh2VNCY1JI1Sn8PQPLdUYss9whkzVxt6UIv1YJIuV/A9nFcIdp
9HoEiofn00lEvggP3v9UH8HzBtOLMsAEeTf/Ghf9MAfrMAOeNRL9fp+SWxz7hamb
Sc+3C9L30om3BwEXz1x+UFfH4nzKHNyOoMKBs8jZu6QN/IALTcpn1gW6SxecFBvE
KJOmjyVBmywZbXjcr0SxBGONIwHa4OEp/3NOI2VfHmr4m+A1nbnSbWDT7r18Dgou
O7epFi7bisnWpkZPjai9gg3perEZNRkb8muBZnVh8AcWgoSjhg+UwyOHOcbyYEPL
dN+XVGgz3U2XLA9x9jR0eKvOCq1zOgJL0vwDJfH3ioDgFeU0RajBS6iDEFFEF+ty
H5aBI00QDbnGuuKcOwgD
=/2VE
-END PGP SIGNATURE-

Changes since libreoffice-4.2.5.2:
Christian Lohmaier (1):
  Version 4.2.5.2, tag libreoffice-4.2.5.2-hotfix1

---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - config_host.mk.in configure.ac ios/CustomTarget_TiledLibreOffice_app.mk ios/lo.xcconfig.in

2014-07-08 Thread Tor Lillqvist

 config_host.mk.in|1 +
 configure.ac |3 +++
 ios/CustomTarget_TiledLibreOffice_app.mk |1 +
 ios/lo.xcconfig.in   |1 +
 4 files changed, 6 insertions(+)

New commits:
commit 493a058dea0119e3eff0fe61f796885a7496df7c
Author: Tor Lillqvist 
Date:   Tue Jul 8 18:02:30 2014 +0300

Set VALID_ARCHS equal to ARCHS

Change-Id: Ief7d3b09cb68eb2abdb99ebc9cfac7f71cd1476e

diff --git a/ios/lo.xcconfig.in b/ios/lo.xcconfig.in
index 60e228e..21fdc15 100644
--- a/ios/lo.xcconfig.in
+++ b/ios/lo.xcconfig.in
@@ -21,6 +21,7 @@ LO_WORKDIR = @WORKDIR@
 // variables are prefixed with XCODE_ to make it clear in configure.ac
 // what they will be used for.
 ARCHS = @XCODE_ARCHS@
+VALID_ARCHS = @XCODE_ARCHS@
 CLANG_CXX_LIBRARY = @XCODE_CLANG_CXX_LIBRARY@
 DEBUG_INFORMATION_FORMAT=@XCODE_DEBUG_INFORMATION_FORMAT@
 
commit a0368175867a53c858133732454c9797ebd29ffc
Author: Tor Lillqvist 
Date:   Tue Jul 8 18:01:35 2014 +0300

Pass -sdk option

Change-Id: I694d90e2cfca2b4b68a33df0d3912c2492563d28

diff --git a/ios/CustomTarget_TiledLibreOffice_app.mk 
b/ios/CustomTarget_TiledLibreOffice_app.mk
index 73f9fcc..aa89470 100644
--- a/ios/CustomTarget_TiledLibreOffice_app.mk
+++ b/ios/CustomTarget_TiledLibreOffice_app.mk
@@ -19,6 +19,7 @@ define TiledLibreOfficeXcodeBuild
xcodebuild \
-project 
experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj \
-target TiledLibreOffice \
+   -sdk $(XCODEBUILD_SDK) \
-arch $(XCODE_ARCHS) \
-configuration $(if $(ENABLE_DEBUG),Debug,Release) \
$(1) \
commit a1711c717e0b5b7b2b5b722aba34cf32aa6c87aa
Author: Tor Lillqvist 
Date:   Tue Jul 8 17:59:59 2014 +0300

Construct and propagate the argument to xcodebuild's -sdk option

Change-Id: I810ea99f61c47da62f2489d5176f6fbb779134a9

diff --git a/config_host.mk.in b/config_host.mk.in
index 382a407..872172e 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -631,6 +631,7 @@ export WPG_LIBS=$(gb_SPACE)@WPG_LIBS@
 export WPS_CFLAGS=$(gb_SPACE)@WPS_CFLAGS@
 export WPS_LIBS=$(gb_SPACE)@WPS_LIBS@
 export XCODE_ARCHS=@XCODE_ARCHS@
+export XCODEBUILD_SDK=@XCODEBUILD_SDK@
 export XINERAMA_LINK=@XINERAMA_LINK@
 export XMLLINT=@XMLLINT@
 export XRANDR_CFLAGS=$(gb_SPACE)@XRANDR_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 12e45dd..efe0bf4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3163,6 +3163,8 @@ if test $_os = iOS; then
 
 AC_MSG_RESULT($sysroot)
 
+XCODEBUILD_SDK=`echo $platform | tr A-Z a-z`$ios_sdk
+
 if test "$enable_ios_simulator" = yes; then
 if test "$BITNESS_OVERRIDE" = 64; then
 XCODE_ARCHS=x86_64
@@ -3225,6 +3227,7 @@ fi
 
 AC_SUBST(XCODE_CLANG_CXX_LIBRARY)
 AC_SUBST(XCODE_ARCHS)
+AC_SUBST(XCODEBUILD_SDK)
 
 AC_MSG_CHECKING([whether to treat the installation as read-only])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/calctiledrendering3' - 4 commits - desktop/source include/LibreOfficeKit include/vcl libreofficekit/qa libreofficekit/source sc/inc sc/source sd/source

2014-07-08 Thread Andrzej Hunt

 desktop/source/lib/init.cxx |   47 
 include/LibreOfficeKit/LibreOfficeKit.h |3 -
 include/LibreOfficeKit/LibreOfficeKit.hxx   |9 ++-
 include/LibreOfficeKit/LibreOfficeKitGtk.h  |7 ++
 include/vcl/ITiledRenderable.hxx|   16 ++
 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |   34 ++
 libreofficekit/source/gtk/lokdocview.c  |   17 +++
 sc/inc/docuno.hxx   |3 +
 sc/source/ui/unoobj/docuno.cxx  |   18 +++
 sd/source/ui/inc/unomodel.hxx   |   18 +++
 sd/source/ui/unoidl/unomodel.cxx|   35 ++
 sw/inc/unotxdoc.hxx |3 +
 sw/source/uibase/uno/unotxdoc.cxx   |   15 ++
 13 files changed, 212 insertions(+), 13 deletions(-)

New commits:
commit 9403558ae247b1783d9149edc4e89772a8883658
Author: Andrzej Hunt 
Date:   Tue Jul 8 16:41:56 2014 +0200

Add Tiled Rendering outline to sd.

Change-Id: I810d827f330690f8071b662b9ddd05cc41655a71

diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx
index f9fafdd..6887663 100644
--- a/sd/source/ui/inc/unomodel.hxx
+++ b/sd/source/ui/inc/unomodel.hxx
@@ -45,6 +45,8 @@
 #include 
 #include 
 
+#include 
+
 #include 
 
 #include 
@@ -76,7 +78,8 @@ class SdXImpressDocument : public SfxBaseModel, // implements 
SfxListener, OWEAK
public ::com::sun::star::lang::XServiceInfo,
public ::com::sun::star::ucb::XAnyCompareFactory,
public 
::com::sun::star::presentation::XHandoutMasterSupplier,
-   public ::com::sun::star::view::XRenderable
+   public ::com::sun::star::view::XRenderable,
+   public ::vcl::ITiledRenderable
 {
 friend class SdDrawPagesAccess;
 friend class SdMasterPagesAccess;
@@ -218,6 +221,19 @@ public:
 virtual ::com::sun::star::uno::Sequence< 
::com::sun::star::beans::PropertyValue > SAL_CALL getRenderer( sal_Int32 
nRenderer, const ::com::sun::star::uno::Any& aSelection, const 
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& 
xOptions ) throw (::com::sun::star::lang::IllegalArgumentException, 
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 virtual void SAL_CALL render( sal_Int32 nRenderer, const 
::com::sun::star::uno::Any& aSelection, const ::com::sun::star::uno::Sequence< 
::com::sun::star::beans::PropertyValue >& xOptions ) throw 
(::com::sun::star::lang::IllegalArgumentException, 
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
+// ITiledRenderable
+virtual void paintTile( VirtualDevice& rDevice,
+int nOutputWidth,
+int nOutputHeight,
+int nTilePosX,
+int nTilePosY,
+long nTileWidth,
+long nTileHeight ) SAL_OVERRIDE;
+virtual Size getDocumentSize() SAL_OVERRIDE;
+virtual void setPart(   int nPart ) SAL_OVERRIDE;
+virtual int  getPart() SAL_OVERRIDE;
+virtual int  getParts() SAL_OVERRIDE;
+
 // XComponent
 
 /** This dispose implementation releases the resources held by the
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index bc970e9..3320236 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2185,6 +2185,41 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 
nRenderer, const uno::Any& r
 }
 }
 
+void SdXImpressDocument::paintTile( VirtualDevice& rDevice,
+int nOutputWidth, int nOutputHeight,
+int nTilePosX, int nTilePosY,
+long nTileWidth, long nTileHeight )
+{
+(void) rDevice;
+(void) nOutputWidth;
+(void) nOutputHeight;
+(void) nTilePosX;
+(void) nTilePosY;
+(void) nTileWidth;
+(void) nTileHeight;
+}
+
+void SdXImpressDocument::setPart( int nPart )
+{
+(void) nPart;
+}
+
+int SdXImpressDocument::getParts()
+{
+return 1;
+}
+
+int SdXImpressDocument::getPart()
+{
+return 0;
+}
+
+Size SdXImpressDocument::getDocumentSize()
+{
+return Size( 100, 100 );
+}
+
+
 uno::Reference< i18n::XForbiddenCharacters > 
SdXImpressDocument::getForbiddenCharsTable()
 {
 uno::Reference< i18n::XForbiddenCharacters > xForb(mxForbidenCharacters);
commit 1f574485de6d685ffa59e6cf6d09b4533e764f4b
Author: Andrzej Hunt 
Date:   Tue Jul 8 15:32:46 2014 +0200

Add part selector to gtktiledviewer.

Change-Id: I569c8f0ebf4476c0a247cde15a263d1db956a14b

diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx 
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 3a232e8..194c5fa 100644

[Bug 65675] LibreOffice 4.2 most annoying bugs

2014-07-08 Thread bugzilla-daemon

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

Michael Meeks  changed:

   What|Removed |Added

 Depends on||81056

-- 
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: filter/Configuration_filter.mk filter/source

2014-07-08 Thread David Tardon

 filter/Configuration_filter.mk |1 
 filter/source/config/fragments/types/calc_HTML.xcu |   35 +
 filter/source/textfilterdetect/filterdetect.cxx|6 +--
 3 files changed, 38 insertions(+), 4 deletions(-)

New commits:
commit 86c6f18c2766aad43d6e3bfcf3530e40440ebca7
Author: David Tardon 
Date:   Tue Jul 8 17:01:27 2014 +0200

avoid problems detecting HTML files with .xls ext.

Change-Id: I9955223aac20f3f640fde51bb7231666c269ca70

diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index e035464..0465f17 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -512,6 +512,7 @@ $(call 
filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fr
 $(call 
filter_Configuration_add_types,fcfg_langpack,fcfg_calc_types.xcu,filter/source/config/fragments/types,\
calc_DIF \
calc_ODS_FlatXML \
+   calc_HTML \
generic_HTML \
generic_Text \
calc_Lotus \
diff --git a/filter/source/config/fragments/types/calc_HTML.xcu 
b/filter/source/config/fragments/types/calc_HTML.xcu
new file mode 100644
index 000..51bf8f1
--- /dev/null
+++ b/filter/source/config/fragments/types/calc_HTML.xcu
@@ -0,0 +1,35 @@
+
+
+
+com.sun.star.comp.filters.PlainTextFilterDetect
+
+xls
+text/html
+false
+
+
+HTML Table
+
+
+
diff --git a/filter/source/textfilterdetect/filterdetect.cxx 
b/filter/source/textfilterdetect/filterdetect.cxx
index ffad7fa..1d29dd4 100644
--- a/filter/source/textfilterdetect/filterdetect.cxx
+++ b/filter/source/textfilterdetect/filterdetect.cxx
@@ -132,7 +132,7 @@ OUString SAL_CALL 
PlainTextFilterDetect::detect(uno::Sequence 
xInStream(aMediaDesc[MediaDescriptor::PROP_INPUTSTREAM()], uno::UNO_QUERY);
 if (!xInStream.is() || !IsHTMLStream(xInStream))
@@ -141,12 +141,10 @@ OUString SAL_CALL 
PlainTextFilterDetect::detect(uno::Sequencehttp://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 75025] LibreOffice 4.3 most annoying bugs

2014-07-08 Thread bugzilla-daemon

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

Jay Philips  changed:

   What|Removed |Added

 Depends on||81055

--- Comment #38 from Jay Philips  ---
Reason - new feature
Bug 81055: Crash when opening an .odp containing 3D model

-- 
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/qa

2014-07-08 Thread Miklos Vajna

 sw/qa/extras/inc/swmodeltestbase.hxx|   13 +
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx|   13 -
 sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx |   13 -
 sw/qa/extras/ooxmlexport/ooxmlw14export.cxx |   13 -
 4 files changed, 13 insertions(+), 39 deletions(-)

New commits:
commit 4b9e9c804db355644527e4993e2fde9d608484ef
Author: Miklos Vajna 
Date:   Tue Jul 8 15:43:46 2014 +0200

sw: clean up DECLARE_OOXMLEXPORT_TEST copy&paste

Change-Id: I2d702a3ea94412a35fee163581ef8c3f28566657

diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx 
b/sw/qa/extras/inc/swmodeltestbase.hxx
index 6826472..8ede21a 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -78,6 +78,19 @@ using namespace css;
 CPPUNIT_TEST_SUITE_REGISTRATION(TestName); \
 void TestName::verify()
 
+#if 1
+#define DECLARE_OOXMLEXPORT_TEST(TestName, filename) 
DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, Test)
+
+// For testing during development of a test, you want to use
+// DECLARE_OOXMLEXPORT_TEST_ONLY, and change the above to #if 0
+// Of course, don't forget to set back to #if 1 when you are done :-)
+#else
+#define DECLARE_OOXMLEXPORT_TEST_ONLY(TestName, filename) 
DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, Test)
+
+#undef DECLARE_OOXMLEXPORT_TEST
+#define DECLARE_OOXMLEXPORT_TEST(TestName, filename) class disabled##TestName 
: public Test { void disabled(); }; void disabled##TestName::disabled()
+#endif
+
 #define DECLARE_SW_IMPORT_TEST(TestName, filename, BaseClass) \
 class TestName : public BaseClass { \
 protected:\
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 910fe13..494b8a8 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -74,19 +74,6 @@ protected:
 }
 };
 
-#if 1
-#define DECLARE_OOXMLEXPORT_TEST(TestName, filename) 
DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, Test)
-
-// For testing during development of a tast, you want to use
-// DECLARE_OOXMLEXPORT_TEST_ONLY, and change the above to #if 0
-// Of course, don't forget to set back to #if 1 when you are done :-)
-#else
-#define DECLARE_OOXMLEXPORT_TEST_ONLY(TestName, filename) 
DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, Test)
-
-#undef DECLARE_OOXMLEXPORT_TEST
-#define DECLARE_OOXMLEXPORT_TEST(TestName, filename) class disabled##TestName 
: public Test { void disabled(); }; void disabled##TestName::disabled()
-#endif
-
 #if !defined(WNT)
 
 DECLARE_OOXMLEXPORT_TEST(testZoom, "zoom.docx")
diff --git a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
index 0aa8235..f887d54 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
@@ -41,19 +41,6 @@ protected:
 }
 };
 
-#if 1
-#define DECLARE_OOXMLEXPORT_TEST(TestName, filename) 
DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, Test)
-
-// For testing during development of a tast, you want to use
-// DECLARE_OOXMLEXPORT_TEST_ONLY, and change the above to #if 0
-// Of course, don't forget to set back to #if 1 when you are done :-)
-#else
-#define DECLARE_OOXMLEXPORT_TEST_ONLY(TestName, filename) 
DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, Test)
-
-#undef DECLARE_OOXMLEXPORT_TEST
-#define DECLARE_OOXMLEXPORT_TEST(TestName, filename) class disabled##TestName 
: public Test { void disabled(); }; void disabled##TestName::disabled()
-#endif
-
 DECLARE_OOXMLEXPORT_TEST(testDmlShapeTitle, "dml-shape-title.docx")
 {
 CPPUNIT_ASSERT_EQUAL(OUString("Title"), getProperty(getShape(1), 
"Title"));
diff --git a/sw/qa/extras/ooxmlexport/ooxmlw14export.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlw14export.cxx
index 84b6945..5354454 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlw14export.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlw14export.cxx
@@ -26,19 +26,6 @@ protected:
 }
 };
 
-#if 1
-#define DECLARE_OOXMLEXPORT_TEST(TestName, filename) 
DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, Test)
-
-// For testing during development of a tast, you want to use
-// DECLARE_OOXMLEXPORT_TEST_ONLY, and change the above to #if 0
-// Of course, don't forget to set back to #if 1 when you are done :-)
-#else
-#define DECLARE_OOXMLEXPORT_TEST_ONLY(TestName, filename) 
DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, Test)
-
-#undef DECLARE_OOXMLEXPORT_TEST
-#define DECLARE_OOXMLEXPORT_TEST(TestName, filename) class disabled##TestName 
: public Test { void disabled(); }; void disabled##TestName::disabled()
-#endif
-
 DECLARE_OOXMLEXPORT_TEST(Test_TextEffects_GlowShadowReflection, 
"TextEffects_Glow_Shadow_Reflection.docx")
 {
 xmlDocPtr pXmlDoc = parseExport("word/document.xml");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-07-08 Thread Miklos Vajna

 sw/qa/extras/ooxmlexport/data/2col-header.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx   |7 +++
 sw/source/filter/ww8/wrtw8nds.cxx  |7 ++-
 3 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit c4a5f8c1afd42acb52d0ae9b4d6f42f3e87364d5
Author: Miklos Vajna 
Date:   Tue Jul 8 14:41:10 2014 +0200

MSWordExportBase: fix export of header/footer in case of multiple columns

Regression from 263938c4a8789d881f8e736d317b6bcc09c3bce5 (fdo#73596
[DOCX] Multiple Columns in Index, 2014-02-13), header / footer was lost
in multi-column section. This fixes both DOC and DOCX export.

Change-Id: Icb30ec882b38853e25289299d8f829a5cf56e6d8

diff --git a/sw/qa/extras/ooxmlexport/data/2col-header.docx 
b/sw/qa/extras/ooxmlexport/data/2col-header.docx
new file mode 100644
index 000..3e8f2c4
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/2col-header.docx 
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index a1bf053..910fe13 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3745,6 +3745,13 @@ DECLARE_OOXMLEXPORT_TEST(testfdo80898, "fdo80898.docx")
 "/word/embeddings/oleObject1.doc");
 }
 
+DECLARE_OOXMLEXPORT_TEST(test2colHeader, "2col-header.docx")
+{
+// Header was lost on export when the document had multiple columns.
+uno::Reference 
xPageStyle(getStyles("PageStyles")->getByName(DEFAULT_STYLE), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(true, getProperty(xPageStyle, "HeaderIsOn"));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx 
b/sw/source/filter/ww8/wrtw8nds.cxx
index 9f2af01..68e2799 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2733,10 +2733,15 @@ bool MSWordExportBase::NoPageBreakSection( const 
SfxItemSet* pSet )
 const SfxPoolItem* pI;
 if( pSet)
 {
-bool bNoPageBreak = true;
+bool bNoPageBreak = false;
 if ( SFX_ITEM_ON != pSet->GetItemState(RES_PAGEDESC, true, &pI)
 || 0 == ((SwFmtPageDesc*)pI)->GetPageDesc() )
 {
+bNoPageBreak = true;
+}
+
+if (bNoPageBreak)
+{
 if (SFX_ITEM_ON != pSet->GetItemState(RES_BREAK, true, &pI))
 bNoPageBreak = true;
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/tools tools/source

2014-07-08 Thread Michael Meeks

 include/tools/date.hxx  |3 +++
 tools/source/datetime/tdate.cxx |   31 +--
 2 files changed, 24 insertions(+), 10 deletions(-)

New commits:
commit a2b44216f1b1e8d7f4f293e13b257f49ae13de61
Author: Michael Meeks 
Date:   Tue Jul 8 11:49:59 2014 +0100

fdo#66507 - accelerate common datum date conversion to days.

Saves ~40bn cycles, 10% of calculation for the bug document.

Change-Id: I9d48706ad2cfe290965b648306d95b4d66e5fc63

diff --git a/include/tools/date.hxx b/include/tools/date.hxx
index 6b08e4a..e750573 100644
--- a/include/tools/date.hxx
+++ b/include/tools/date.hxx
@@ -190,6 +190,9 @@ public:
 /// Semantically identical to Normalize() member method.
 static bool Normalize( sal_uInt16 & rDay, sal_uInt16 & rMonth, sal_uInt16 
& rYear );
 
+ private:
+/// An accelerated form of DateToDays on this date
+long GetAsNormalizedDays() const;
 };
 
 #endif
diff --git a/tools/source/datetime/tdate.cxx b/tools/source/datetime/tdate.cxx
index 4fc2fc0..e1e640d 100644
--- a/tools/source/datetime/tdate.cxx
+++ b/tools/source/datetime/tdate.cxx
@@ -62,6 +62,17 @@ sal_uInt16 Date::GetDaysInMonth( sal_uInt16 nMonth, 
sal_uInt16 nYear )
 return ImplDaysInMonth( nMonth, nYear);
 }
 
+long Date::GetAsNormalizedDays() const
+{
+// This is a very common datum we often calculate from.
+if (nDate == 18991230) // 1899-12-30
+{
+assert(DateToDays( GetDay(), GetMonth(), GetYear() ) == 693594);
+return 693594;
+}
+return DateToDays( GetDay(), GetMonth(), GetYear() );
+}
+
 long Date::DateToDays( sal_uInt16 nDay, sal_uInt16 nMonth, sal_uInt16 nYear )
 {
 long nDays;
@@ -173,7 +184,7 @@ void Date::SetYear( sal_uInt16 nNewYear )
 
 DayOfWeek Date::GetDayOfWeek() const
 {
-return (DayOfWeek)((sal_uIntPtr)(DateToDays( GetDay(), GetMonth(), 
GetYear() )-1) % 7);
+return (DayOfWeek)((sal_uIntPtr)(GetAsNormalizedDays()-1) % 7);
 }
 
 sal_uInt16 Date::GetDayOfYear() const
@@ -263,7 +274,8 @@ sal_uInt16 Date::GetWeekOfYear( DayOfWeek eStartDay,
 {
 // next x_Sunday == first x_Sunday in the new year
 // == still the same week!
-long nTempDays = DateToDays( GetDay(), GetMonth(), GetYear() );
+long nTempDays = GetAsNormalizedDays();
+
 nTempDays +=  6 - (GetDayOfWeek()+(7-(short)eStartDay)) % 7;
 sal_uInt16  nDay;
 sal_uInt16  nMonth;
@@ -405,7 +417,7 @@ Date& Date::operator +=( long nDays )
 if (nDays == 0)
 return *this;
 
-longnTempDays = DateToDays( GetDay(), GetMonth(), GetYear() );
+long nTempDays = GetAsNormalizedDays();
 
 nTempDays += nDays;
 if ( nTempDays > MAX_DAYS )
@@ -430,7 +442,7 @@ Date& Date::operator -=( long nDays )
 if (nDays == 0)
 return *this;
 
-longnTempDays = DateToDays( GetDay(), GetMonth(), GetYear() );
+long nTempDays = GetAsNormalizedDays();
 
 nTempDays -= nDays;
 if ( nTempDays > MAX_DAYS )
@@ -451,7 +463,7 @@ Date& Date::operator ++()
 sal_uInt16  nDay;
 sal_uInt16  nMonth;
 sal_uInt16  nYear;
-longnTempDays = DateToDays( GetDay(), GetMonth(), GetYear() );
+long nTempDays = GetAsNormalizedDays();
 
 if ( nTempDays < MAX_DAYS )
 {
@@ -468,7 +480,7 @@ Date& Date::operator --()
 sal_uInt16  nDay;
 sal_uInt16  nMonth;
 sal_uInt16  nYear;
-longnTempDays = DateToDays( GetDay(), GetMonth(), GetYear() );
+long nTempDays = GetAsNormalizedDays();
 
 if ( nTempDays > 1 )
 {
@@ -509,10 +521,9 @@ Date operator -( const Date& rDate, long nDays )
 
 long operator -( const Date& rDate1, const Date& rDate2 )
 {
-sal_uIntPtr  nTempDays1 = Date::DateToDays( rDate1.GetDay(), 
rDate1.GetMonth(),
-rDate1.GetYear() );
-sal_uIntPtr  nTempDays2 = Date::DateToDays( rDate2.GetDay(), 
rDate2.GetMonth(),
-rDate2.GetYear() );
+sal_uIntPtr nTempDays1 = rDate1.GetAsNormalizedDays();
+sal_uIntPtr nTempDays2 = rDate2.GetAsNormalizedDays();
+
 return nTempDays1 - nTempDays2;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 4 commits - accessibility/source comphelper/source framework/Library_fwe.mk include/comphelper include/connectivity include/svtools include/toolkit sfx2/Library_sfx.mk

2014-07-08 Thread Noel Grandin

 accessibility/source/helper/acc_factory.cxx  |   24 
 comphelper/source/misc/asyncnotification.cxx |   18 --
 framework/Library_fwe.mk |1 
 include/comphelper/asyncnotification.hxx |9 ---
 include/connectivity/CommonTools.hxx |   30 +-
 include/svtools/accessiblefactory.hxx|5 +
 include/svtools/toolpanel/decklayouter.hxx   |3 -
 include/svtools/toolpanel/drawerlayouter.hxx |7 --
 include/svtools/toolpanel/refbase.hxx|   75 ---
 include/svtools/toolpanel/tablayouter.hxx|8 --
 include/svtools/toolpanel/toolpanel.hxx  |9 +--
 include/toolkit/helper/accessiblefactory.hxx |2 
 sfx2/Library_sfx.mk  |1 
 svtools/Library_svt.mk   |1 
 svtools/source/misc/svtaccessiblefactory.cxx |   24 
 svtools/source/table/defaultinputhandler.cxx |   10 +--
 svtools/source/table/mousefunction.cxx   |   21 ---
 svtools/source/table/mousefunction.hxx   |   37 ++---
 svtools/source/toolpanel/drawerlayouter.cxx  |3 -
 svtools/source/toolpanel/dummypanel.cxx  |3 -
 svtools/source/toolpanel/dummypanel.hxx  |7 --
 svtools/source/toolpanel/refbase.cxx |   50 --
 svtools/source/toolpanel/tablayouter.cxx |3 -
 svtools/source/toolpanel/toolpanel.cxx   |4 -
 svx/source/form/fmscriptingenv.cxx   |   25 -
 svx/source/inc/fmscriptingenv.hxx|3 -
 26 files changed, 39 insertions(+), 344 deletions(-)

New commits:
commit f692c88e6062889aa12bf6cd7a71f63d177a37c4
Author: Noel Grandin 
Date:   Tue Jul 8 15:15:42 2014 +0200

use SimpleReferenceObject in comphelper module

to replace hand-rolled version

Change-Id: Ie4e66d2f1f893c04be589877ef53f470ca74c9eb

diff --git a/comphelper/source/misc/asyncnotification.cxx 
b/comphelper/source/misc/asyncnotification.cxx
index a8c018c..dafe1a7 100644
--- a/comphelper/source/misc/asyncnotification.cxx
+++ b/comphelper/source/misc/asyncnotification.cxx
@@ -38,7 +38,6 @@ namespace comphelper
 
 
 AnyEvent::AnyEvent()
-:m_refCount( 0 )
 {
 }
 
@@ -48,23 +47,6 @@ namespace comphelper
 }
 
 
-oslInterlockedCount SAL_CALL AnyEvent::acquire()
-{
-return osl_atomic_increment( &m_refCount );
-}
-
-
-oslInterlockedCount SAL_CALL AnyEvent::release()
-{
-if ( 0 == osl_atomic_decrement( &m_refCount ) )
-{
-delete this;
-return 0;
-}
-return m_refCount;
-}
-
-
 //= ProcessableEvent
 
 struct ProcessableEvent
diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk
index ab5f460..ee08654 100644
--- a/framework/Library_fwe.mk
+++ b/framework/Library_fwe.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,fwe,\
 cppuhelper \
 fwi \
 sal \
+salhelper \
i18nlangtag \
 svl \
 svt \
diff --git a/include/comphelper/asyncnotification.hxx 
b/include/comphelper/asyncnotification.hxx
index 19f9fa8..9320976 100644
--- a/include/comphelper/asyncnotification.hxx
+++ b/include/comphelper/asyncnotification.hxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 
 
 namespace comphelper
@@ -38,17 +39,11 @@ namespace comphelper
 
 /** the very basic instance to hold a description of an event
 */
-class COMPHELPER_DLLPUBLIC AnyEvent : ::rtl::IReference
+class COMPHELPER_DLLPUBLIC AnyEvent : public 
salhelper::SimpleReferenceObject
 {
-private:
-oslInterlockedCount m_refCount;
-
 public:
 AnyEvent();
 
-virtual oslInterlockedCount SAL_CALL acquire() SAL_OVERRIDE;
-virtual oslInterlockedCount SAL_CALL release() SAL_OVERRIDE;
-
 protected:
 virtual ~AnyEvent();
 
commit 48cc4f1b8cf06a8e56c12e659a71f72d609568cd
Author: Noel Grandin 
Date:   Tue Jul 8 14:21:40 2014 +0200

use SimpleReferenceObject in connectivity module

to replace hand-rolled version

Change-Id: I7a7bf7f8f7d4f8a73ee842e7aba5eab5a254d8eb

diff --git a/include/connectivity/CommonTools.hxx 
b/include/connectivity/CommonTools.hxx
index d099905..4199c9c 100644
--- a/include/connectivity/CommonTools.hxx
+++ b/include/connectivity/CommonTools.hxx
@@ -37,6 +37,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace com { namespace sun { namespace star { namespace util {
 struct Date;
@@ -63,19 +64,18 @@ namespace connectivity
 typedef std::map OSQLTables;
 
 // class ORefVector allows reference counting on a std::vector
-template< class VectorVal > class ORefVector
+template< class VectorVal > class ORefVector : public 
salhelper::SimpleReferenceObject
 {
 std::vector< VectorVal > m_vector;
-oslInterlockedCount m_refCount;
 
 protected:
 virtual ~ORefVector(){}
 public:
 typedef std::vector< VectorVal > Vector;
 
-ORefVec

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - ucb/source

2014-07-08 Thread Matúš Kukan

 ucb/source/ucp/webdav/webdavcontent.cxx |   12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 27fec073a8e78aad1979160bc4c8d9a4aafc3e82
Author: MatÃºÅ¡ Kukan 
Date:   Tue Jul 8 09:00:51 2014 +0200

webdav: fix locking in webdav_ucp::Content::getResourceType()

This commit cherry-picks 49a454225e35699d7351faaba3d296e1858c6107
for serf webdav version.

Change-Id: Ic5aba4fba8f8a2a521224b08865500dd932e85bf
(cherry picked from commit 9da4e46957bd1a69c4339eeb1d107546c400e6e3)
Reviewed-on: https://gerrit.libreoffice.org/10129
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx 
b/ucb/source/ucp/webdav/webdavcontent.cxx
index cd416cc..3d720b7 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -3394,7 +3394,17 @@ const Content::ResourceType & Content::getResourceType(
 const uno::Reference< ucb::XCommandEnvironment >& xEnv )
 throw ( uno::Exception )
 {
-return getResourceType( xEnv, m_xResAccess );
+boost::scoped_ptr< DAVResourceAccess > xResAccess;
+{
+osl::MutexGuard aGuard( m_aMutex );
+xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) );
+}
+const Content::ResourceType & ret = getResourceType( xEnv, xResAccess );
+{
+osl::Guard< osl::Mutex > aGuard( m_aMutex );
+m_xResAccess.reset( new DAVResourceAccess( *xResAccess.get() ) );
+}
+return ret;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-07-08 Thread Andras Timar

 starmath/uiconfig/smath/ui/smathsettings.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4861e4961f7dc4f28a14c5f9d9b969456bfec720
Author: Andras Timar 
Date:   Tue Jul 8 14:42:14 2014 +0200

fdo#81036 escape ~ in .ui and fix a typo (straight apostrophe)

Change-Id: I652dc63cc0e8fb04d7c3115d66d60dabda60f0f4

diff --git a/starmath/uiconfig/smath/ui/smathsettings.ui 
b/starmath/uiconfig/smath/ui/smathsettings.ui
index 02b31a9..63d7f7f 100644
--- a/starmath/uiconfig/smath/ui/smathsettings.ui
+++ b/starmath/uiconfig/smath/ui/smathsettings.ui
@@ -239,7 +239,7 @@
 6
 
   
-Ig_nore ~ and ` 
at the end of the line
+Ig_nore ~~ and ' 
at the end of the line
 True
 True
 False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-07-08 Thread Michael Stahl

 sw/source/core/undo/untbl.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit 65438659a18698334f22307ccb4d5ed844b637bf
Author: Michael Stahl 
Date:   Tue Jul 8 14:29:05 2014 +0200

sw: work around mysterious MSVC warning C4258

Cleraly the variable "n" from line 999 is not in scope in
line 1054 or line 1057?

Change-Id: I8ca321e6030390ad0192e4dceb37d87b6f06f0a5

diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index abb2539..bc71738 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -1051,10 +1051,18 @@ void _SaveTable::CreateNew( SwTable& rTbl, bool 
bCreateFrms,
 }
 }
 
+#ifdef _MSC_VER
+// MSVC 2012 appears very confused and rambles about a declaration of "n" below
+#pragma warning (push, 1)
+#pragma warning (disable: 4258)
+#endif
 for( SwTableLines::const_iterator it = rTbl.GetTabLines().begin() + n;
  it != rTbl.GetTabLines().begin() + nOldLines; ++it )
 delete *it;
 rTbl.GetTabLines().erase( rTbl.GetTabLines().begin() + n, 
rTbl.GetTabLines().begin() + nOldLines );
+#ifdef _MSC_VER
+#pragma warning (pop)
+#endif
 }
 
 aParent.GetTabLines().erase( aParent.GetTabLines().begin(), 
aParent.GetTabLines().begin() + n );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-07-08 Thread Caolán McNamara

 include/oox/drawingml/shapepropertymap.hxx |8 
 oox/source/drawingml/chart/objectformatter.cxx |5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit f03ae69617b37e7e55511d8eb4979390a0469968
Author: CaolÃ¡n McNamara 
Date:   Mon Jul 7 11:44:23 2014 +0100

fix crash loading ooo100546-1.xls

regressions around inserted extra enum values
into ShapePropertyId

(cherry picked from commit aacfd5038d05a02f8b1eade3a5896d3d7e959f3d)

Conflicts:
oox/source/drawingml/chart/objectformatter.cxx

Change-Id: I06696c8cfe4acc3836723c31d5e714bd7d8439b3
Reviewed-on: https://gerrit.libreoffice.org/10108
Reviewed-by: MatÃºÅ¡ Kukan 
Tested-by: MatÃºÅ¡ Kukan 
(cherry picked from commit 9afdc6c3b4eb077b3e4279c5eec1e3dd9a4a8512)
Reviewed-on: https://gerrit.libreoffice.org/10111
Reviewed-by: Markus Mohrhard 
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/include/oox/drawingml/shapepropertymap.hxx 
b/include/oox/drawingml/shapepropertymap.hxx
index f451cc0..13e8e50 100644
--- a/include/oox/drawingml/shapepropertymap.hxx
+++ b/include/oox/drawingml/shapepropertymap.hxx
@@ -30,12 +30,14 @@ namespace oox { class ModelObjectHelper; }
 namespace oox {
 namespace drawingml {
 
-
-
 /** Enumeration for various properties related to drawing shape formatting.
 
 This is an abstraction for shape formatting properties that have different
 names in various implementations, e.g. drawing shapes vs. chart objects.
+
+If you *insert* ids into this list, then update spnCommonPropIds, 
spnLinearPropIds
+and spnFilledPropIds of oox/source/drawingml/chart/objectformatter.cxx if
+the newly inserted enum is inside the range they cover
  */
 enum ShapePropertyId
 {
@@ -69,8 +71,6 @@ enum ShapePropertyId
 SHAPEPROP_END
 };
 
-
-
 struct OOX_DLLPUBLIC ShapePropertyInfo
 {
 std::vector maPropertyIds;
diff --git a/oox/source/drawingml/chart/objectformatter.cxx 
b/oox/source/drawingml/chart/objectformatter.cxx
index adcc3f3..54ef18a 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -460,7 +460,7 @@ const AutoTextEntry* lclGetAutoTextEntry( const 
AutoTextEntry* pEntries, sal_Int
 return 0;
 }
 
-
+// These PropIds arrays will be indexed into using a ShapePropertyId enum 
(include/oox/drawingml/shapepropertymap.hxx)
 
 /** Property identifiers for common chart objects, to be used in 
ShapePropertyInfo. */
 static const sal_Int32 spnCommonPropIds[] =
@@ -478,7 +478,7 @@ static const sal_Int32 spnLinearPropIds[] =
 {
 PROP_LineStyle, PROP_LineWidth, PROP_Color, PROP_Transparency, 
PROP_LineDashName,
 PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, 
PROP_INVALID, PROP_INVALID,
-PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID,
+PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID,
 PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID,
 PROP_INVALID, PROP_INVALID, PROP_INVALID,
 PROP_END_LIST
@@ -502,6 +502,7 @@ static const sal_Int32 spnFilledPropIds[] =
 PROP_FillStyle,
 PROP_Color,
 PROP_Transparency,
+PROP_INVALID,
 PROP_GradientName,
 PROP_FillBitmapName,
 PROP_FillBitmapMode,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-07-08 Thread Oliver-Rainer Wittmann

 sw/inc/IDocumentMarkAccess.hxx|5 --
 sw/source/core/doc/docbm.cxx  |   54 --
 sw/source/core/doc/docdde.cxx |4 -
 sw/source/core/inc/MarkManager.hxx|5 --
 sw/source/filter/ww8/wrtw8nds.cxx |9 ++-
 writerfilter/source/dmapper/DomainMapper.cxx  |5 +-
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |8 ++-
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |6 +-
 8 files changed, 23 insertions(+), 73 deletions(-)

New commits:
commit f73412f09ca8a34bb7ec73370dae3e6033c0c581
Author: Oliver-Rainer Wittmann 
Date:   Tue Jul 8 11:45:46 2014 +

125215: MarkManager: remove unnecessary mark container

diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx
index 0057999..a16a861 100644
--- a/sw/inc/IDocumentMarkAccess.hxx
+++ b/sw/inc/IDocumentMarkAccess.hxx
@@ -250,11 +250,6 @@ class IDocumentMarkAccess
 virtual ::sw::mark::IFieldmark* getFieldmarkBefore(const SwPosition& 
pos) const =0;
 virtual ::sw::mark::IFieldmark* getFieldmarkAfter(const SwPosition& 
pos) const =0;
 
-// Marks exclusive annotation marks
-virtual const_iterator_t getCommonMarksBegin() const = 0;
-virtual const_iterator_t getCommonMarksEnd() const = 0;
-virtual sal_Int32 getCommonMarksCount() const = 0;
-
 // Annotation Marks
 virtual const_iterator_t getAnnotationMarksBegin() const = 0;
 virtual const_iterator_t getAnnotationMarksEnd() const = 0;
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 792e2c5..4626111 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -358,7 +358,6 @@ namespace sw { namespace mark
 , m_vBookmarks()
 , m_vFieldmarks()
 , m_vAnnotationMarks()
-, m_vCommonMarks()
 , m_pDoc(&rDoc)
 { }
 
@@ -444,13 +443,11 @@ namespace sw { namespace mark
 case IDocumentMarkAccess::BOOKMARK:
 case IDocumentMarkAccess::CROSSREF_NUMITEM_BOOKMARK:
 case IDocumentMarkAccess::CROSSREF_HEADING_BOOKMARK:
-lcl_InsertMarkSorted(m_vCommonMarks, pMark);
 // if(dynamic_cast)
 lcl_InsertMarkSorted(m_vBookmarks, pMark);
 break;
 case IDocumentMarkAccess::TEXT_FIELDMARK:
 case IDocumentMarkAccess::CHECKBOX_FIELDMARK:
-lcl_InsertMarkSorted(m_vCommonMarks, pMark);
 // if(dynamic_cast
 lcl_InsertMarkSorted(m_vFieldmarks, pMark);
 break;
@@ -460,7 +457,6 @@ namespace sw { namespace mark
 case IDocumentMarkAccess::NAVIGATOR_REMINDER:
 case IDocumentMarkAccess::DDE_BOOKMARK:
 case IDocumentMarkAccess::UNO_BOOKMARK:
-lcl_InsertMarkSorted(m_vCommonMarks, pMark);
 // no special array for these
 break;
 }
@@ -830,16 +826,6 @@ namespace sw { namespace mark
 {
 OSL_ENSURE( false, " - 
Bookmark not found in Bookmark container.");
 }
-
-ppBookmark = lcl_FindMark(m_vCommonMarks, *ppMark);
-if ( ppBookmark != m_vCommonMarks.end() )
-{
-m_vCommonMarks.erase(ppBookmark);
-}
-else
-{
-OSL_ENSURE( false, " - 
Bookmark not found in common mark container.");
-}
 }
 break;
 
@@ -862,15 +848,6 @@ namespace sw { namespace mark
 pTextFieldmark->ReleaseDoc(m_pDoc);
 }
 
-ppFieldmark = lcl_FindMark(m_vCommonMarks, *ppMark);
-if ( ppFieldmark != m_vCommonMarks.end() )
-{
-m_vCommonMarks.erase(ppFieldmark);
-}
-else
-{
-OSL_ENSURE( false, " - 
Fieldmark not found in common mark container.");
-}
 }
 break;
 
@@ -891,17 +868,7 @@ namespace sw { namespace mark
 case IDocumentMarkAccess::NAVIGATOR_REMINDER:
 case IDocumentMarkAccess::DDE_BOOKMARK:
 case IDocumentMarkAccess::UNO_BOOKMARK:
-{
-IDocumentMarkAccess::iterator_t ppOtherMark = 
lcl_FindMark(m_vCommonMarks, *ppMark);
-if ( ppOtherMark != m_vCommonMarks.end() )
-{
-m_vCommonMarks.erase(ppOtherMark);
-}
-else
-{
-OSL_ENSURE( false, " - 
Navigator Reminder, DDE Mark or Uno Makr not found in common mark container.");
-}
-}

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

2014-07-08 Thread Caolán McNamara

 include/oox/drawingml/shapepropertymap.hxx |4 
 oox/source/drawingml/chart/objectformatter.cxx |8 
 2 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit c774070aa07e2d5a56bee101b6f026dceae86137
Author: CaolÃ¡n McNamara 
Date:   Mon Jul 7 11:44:23 2014 +0100

fix crash loading ooo100546-1.xls

regressions around inserted extra enum values
into ShapePropertyId

(cherry picked from commit aacfd5038d05a02f8b1eade3a5896d3d7e959f3d)

Conflicts:
include/oox/drawingml/shapepropertymap.hxx
oox/source/drawingml/chart/objectformatter.cxx

Change-Id: I06696c8cfe4acc3836723c31d5e714bd7d8439b3
Reviewed-on: https://gerrit.libreoffice.org/10136
Reviewed-by: MatÃºÅ¡ Kukan 
Tested-by: MatÃºÅ¡ Kukan 

diff --git a/include/oox/drawingml/shapepropertymap.hxx 
b/include/oox/drawingml/shapepropertymap.hxx
index f2dc8ec..f8ba462 100644
--- a/include/oox/drawingml/shapepropertymap.hxx
+++ b/include/oox/drawingml/shapepropertymap.hxx
@@ -34,6 +34,10 @@ namespace drawingml {
 
 This is an abstraction for shape formatting properties that have different
 names in various implementations, e.g. drawing shapes vs. chart objects.
+
+If you *insert* ids into this list, then update spnCommonPropIds, 
spnLinearPropIds
+and spnFilledPropIds of oox/source/drawingml/chart/objectformatter.cxx if
+the newly inserted enum is inside the range they cover
  */
 enum ShapePropertyId
 {
diff --git a/oox/source/drawingml/chart/objectformatter.cxx 
b/oox/source/drawingml/chart/objectformatter.cxx
index 2541d42..a69dae0 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -460,14 +460,14 @@ const AutoTextEntry* lclGetAutoTextEntry( const 
AutoTextEntry* pEntries, sal_Int
 return 0;
 }
 
-// 
+// These PropIds arrays will be indexed into using a ShapePropertyId enum 
(include/oox/drawingml/shapepropertymap.hxx)
 
 /** Property identifiers for common chart objects, to be used in 
ShapePropertyInfo. */
 static const sal_Int32 spnCommonPropIds[] =
 {
 PROP_LineStyle, PROP_LineWidth, PROP_LineColor, PROP_LineTransparence, 
PROP_LineDashName,
 PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, 
PROP_INVALID, PROP_INVALID,
-PROP_FillStyle, PROP_FillColor, PROP_FillTransparence, 
PROP_FillGradientName,
+PROP_FillStyle, PROP_FillColor, PROP_FillTransparence, PROP_INVALID, 
PROP_FillGradientName,
 PROP_FillBitmapName, PROP_FillBitmapMode, PROP_FillBitmapSizeX, 
PROP_FillBitmapSizeY,
 PROP_FillBitmapPositionOffsetX, PROP_FillBitmapPositionOffsetY, 
PROP_FillBitmapRectanglePoint
 };
@@ -477,7 +477,7 @@ static const sal_Int32 spnLinearPropIds[] =
 {
 PROP_LineStyle, PROP_LineWidth, PROP_Color, PROP_Transparency, 
PROP_LineDashName,
 PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, 
PROP_INVALID, PROP_INVALID,
-PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID,
+PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID,
 PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID,
 PROP_INVALID, PROP_INVALID, PROP_INVALID
 };
@@ -487,7 +487,7 @@ static const sal_Int32 spnFilledPropIds[] =
 {
 PROP_BorderStyle, PROP_BorderWidth, PROP_BorderColor, 
PROP_BorderTransparency, PROP_BorderDashName,
 PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, 
PROP_INVALID, PROP_INVALID,
-PROP_FillStyle, PROP_Color, PROP_Transparency, PROP_GradientName,
+PROP_FillStyle, PROP_Color, PROP_Transparency, PROP_INVALID, 
PROP_GradientName,
 PROP_FillBitmapName, PROP_FillBitmapMode, PROP_FillBitmapSizeX, 
PROP_FillBitmapSizeY,
 PROP_FillBitmapPositionOffsetX, PROP_FillBitmapPositionOffsetY, 
PROP_FillBitmapRectanglePoint
 };
___
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' - sw/source

2014-07-08 Thread Caolán McNamara

 sw/source/filter/ww8/ww8par.cxx |   39 ++-
 1 file changed, 26 insertions(+), 13 deletions(-)

New commits:
commit 66c3f4ad802a8d24caa30c772381db66dd52dc7f
Author: CaolÃ¡n McNamara 
Date:   Fri Jul 4 16:50:54 2014 +0100

fix crash loading ooo#93570-3.doc

regression from f2945255df273404ee2457dcf761cb8f334b732b
cp#201310151026: doc import of comments affecting more text nodes

use Move(fnMoveBackward, fnGoNode) to at least ensure we stop going
backwards when we run out of valid places to go backwards to.

This still isn't great because the distance between two msword character
indexes only equates to the same distance between our characters in the very
simple cases

Change-Id: I248fd12c067577d2f1fd64f48583321eb6d453e4
(cherry picked from commit b1cd83c625a2afeb9da43cc9745d79c01963c797)
Reviewed-on: https://gerrit.libreoffice.org/10140
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 0ba789b..42e4ad3 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2163,9 +2163,18 @@ long SwWW8ImplReader::Read_And(WW8PLCFManResult* pRes)
 {
 WW8_CP nStart = GetAnnotationStart(nAtnIndex);
 WW8_CP nEnd = 
GetAnnotationEnd(GetAnnotationEndIndex(nAtnIndex));
+//It is unfortunately fragile and wrong to assume that two
+//character positions in the original word document, which is
+//what nStart and nEnd are, will equate to the same length in
+//the destination writer document.
+//
+//Better would be, while writing the content into the writer
+//document to store the equivalent writer document positions
+//that relate to each annotation index as the parser passes
+//those points.
 sal_Int32 nLen = nEnd - nStart;
 if( nLen )
- {
+{
 if (pPaM->GetPoint()->nContent.GetIndex() >= nLen)
 {
 pPaM->SetMark();
@@ -2177,24 +2186,28 @@ long SwWW8ImplReader::Read_And(WW8PLCFManResult* pRes)
 nLen -= pPaM->GetPoint()->nContent.GetIndex();
 
 SwTxtNode* pTxtNode = 0;
-// Find first text node which affected by the comment
-while( pPaM->GetPoint()->nNode >= 0 )
+
+// Find first text node which is affected by the 
comment
+while (nLen > 0)
 {
-SwNode* pNode = 0;
-// Find previous text node
-do
+// Move to previous content node
+bool bSuccess = pPaM->Move(fnMoveBackward, 
fnGoNode);
+
+if (!bSuccess)
 {
-pPaM->GetPoint()->nNode--;
-nLen--; // End line character
-pNode = &pPaM->GetPoint()->nNode.GetNode();
+nLen = 0;
+break;
 }
-while( !pNode->IsTxtNode() && 
pPaM->GetPoint()->nNode >= 0 );
+
+--nLen; // End line character
+
+SwNode& rNode = pPaM->GetPoint()->nNode.GetNode();
 
 // Subtract previous text node's length
-if( pNode->IsTxtNode() )
+if (rNode.IsTxtNode())
 {
-pTxtNode = pNode->GetTxtNode();
-if( nLen < pTxtNode->Len() )
+pTxtNode = rNode.GetTxtNode();
+if (nLen < pTxtNode->Len())
 break;
 else
 nLen -= pTxtNode->Len();
___
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' - sw/source

2014-07-08 Thread Miklos Vajna

 sw/source/filter/ww8/ww8par.cxx |   14 +-
 sw/source/filter/ww8/ww8par.hxx |2 ++
 2 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit d791e45741a7ff36c0942a600d2ee0c7fabcd06a
Author: Miklos Vajna 
Date:   Tue Feb 4 16:02:49 2014 +0100

DOC import: fix nested comments

See 2.9.70 (FBKF) in the spec, the ibkl field should be used to find the
position in PlcfBkf.

Previously we assumed that PlcfBkl and PlcfBkf is parallel for
annotations, as but that's not true for nested comments.

Change-Id: I76a6a757b41d2f9b7fe7fe9c9e01a92c251f7b32
(cherry picked from commit 5cfda4f4de8da82485e27b1f0f0d94211d3b4d95)
Reviewed-on: https://gerrit.libreoffice.org/10138
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index ed42bf4..0ba789b 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2162,7 +2162,7 @@ long SwWW8ImplReader::Read_And(WW8PLCFManResult* pRes)
 if (nAtnIndex != -1)
 {
 WW8_CP nStart = GetAnnotationStart(nAtnIndex);
-WW8_CP nEnd = GetAnnotationEnd(nAtnIndex);
+WW8_CP nEnd = 
GetAnnotationEnd(GetAnnotationEndIndex(nAtnIndex));
 sal_Int32 nLen = nEnd - nStart;
 if( nLen )
  {
@@ -5951,6 +5951,18 @@ int SwWW8ImplReader::GetAnnotationIndex(sal_uInt32 nTag)
 return -1;
 }
 
+sal_uInt16 SwWW8ImplReader::GetAnnotationEndIndex(sal_uInt16 nStart)
+{
+WW8_CP nStartAkt;
+void* p;
+if (mpAtnStarts->GetData(nStart, nStartAkt, p) && p)
+{
+// p is an FBKF, and its first 2 bytes is the ibkl member, which is 
the end index.
+return SVBT16ToShort(*((SVBT16*)p));
+}
+return nStart;
+}
+
 WW8_CP SwWW8ImplReader::GetAnnotationStart(int nIndex)
 {
 if (!mpAtnStarts.get() && pWwFib->lcbPlcfAtnbkf)
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 772da4c..9434c2e 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1635,6 +1635,8 @@ private:
 
 const OUString* GetAnnotationAuthor(sal_uInt16 nIdx);
 int GetAnnotationIndex(sal_uInt32 nTag);
+/// Return the end index based on the start one.
+sal_uInt16 GetAnnotationEndIndex(sal_uInt16 nStart);
 WW8_CP GetAnnotationStart(int nIndex);
 WW8_CP GetAnnotationEnd(int nIndex);
 
___
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' - sw/source

2014-07-08 Thread Caolán McNamara

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

New commits:
commit 012e30066a83dda4d20b87834944c818a91a2aab
Author: CaolÃ¡n McNamara 
Date:   Fri Jan 24 13:13:59 2014 +

coverity#1158240 Dereference before null check

Change-Id: I5ce6d5514c6bb2298dd00c43d21a43dba55268c3
(cherry picked from commit 6c7b64bad403fb6eeac6e79d356f456f741a00d4)
Reviewed-on: https://gerrit.libreoffice.org/10139
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 7312c7b..ed42bf4 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2190,8 +2190,8 @@ long SwWW8ImplReader::Read_And(WW8PLCFManResult* pRes)
 }
 while( !pNode->IsTxtNode() && 
pPaM->GetPoint()->nNode >= 0 );
 
-// Subtrackt previous text node's length
-if( pNode && pNode->IsTxtNode() )
+// Subtract previous text node's length
+if( pNode->IsTxtNode() )
 {
 pTxtNode = pNode->GetTxtNode();
 if( nLen < pTxtNode->Len() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

GSoC Refactor god objects weekly report

2014-07-08 Thread V

This week I refactored IDocumentOutlineNodes and did most of the work 
IDocumentContentOperations but some design decisions still need to be 
made for it.


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

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

2014-07-08 Thread Caolán McNamara

 sw/source/filter/ww8/ww8par.cxx |   39 ++-
 1 file changed, 26 insertions(+), 13 deletions(-)

New commits:
commit 6f063c3b0d58f27187948e013fbd759767324f5c
Author: CaolÃ¡n McNamara 
Date:   Fri Jul 4 16:50:54 2014 +0100

fix crash loading ooo#93570-3.doc

regression from f2945255df273404ee2457dcf761cb8f334b732b
cp#201310151026: doc import of comments affecting more text nodes

use Move(fnMoveBackward, fnGoNode) to at least ensure we stop going
backwards when we run out of valid places to go backwards to.

This still isn't great because the distance between two msword character
indexes only equates to the same distance between our characters in the very
simple cases

Change-Id: I248fd12c067577d2f1fd64f48583321eb6d453e4
(cherry picked from commit b1cd83c625a2afeb9da43cc9745d79c01963c797)
Reviewed-on: https://gerrit.libreoffice.org/10099
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 
(cherry picked from commit 2aa92af90a50896aa4f5d2a2287eb5db12e6c621)
Reviewed-on: https://gerrit.libreoffice.org/10110
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 27274f2..c3e29c3 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2169,9 +2169,18 @@ long SwWW8ImplReader::Read_And(WW8PLCFManResult* pRes)
 {
 WW8_CP nStart = GetAnnotationStart(nAtnIndex);
 WW8_CP nEnd = 
GetAnnotationEnd(GetAnnotationEndIndex(nAtnIndex));
+//It is unfortunately fragile and wrong to assume that two
+//character positions in the original word document, which is
+//what nStart and nEnd are, will equate to the same length in
+//the destination writer document.
+//
+//Better would be, while writing the content into the writer
+//document to store the equivalent writer document positions
+//that relate to each annotation index as the parser passes
+//those points.
 sal_Int32 nLen = nEnd - nStart;
 if( nLen )
- {
+{
 if (pPaM->GetPoint()->nContent.GetIndex() >= nLen)
 {
 pPaM->SetMark();
@@ -2183,24 +2192,28 @@ long SwWW8ImplReader::Read_And(WW8PLCFManResult* pRes)
 nLen -= pPaM->GetPoint()->nContent.GetIndex();
 
 SwTxtNode* pTxtNode = 0;
-// Find first text node which affected by the comment
-while( pPaM->GetPoint()->nNode >= 0 )
+
+// Find first text node which is affected by the 
comment
+while (nLen > 0)
 {
-SwNode* pNode = 0;
-// Find previous text node
-do
+// Move to previous content node
+bool bSuccess = pPaM->Move(fnMoveBackward, 
fnGoNode);
+
+if (!bSuccess)
 {
-pPaM->GetPoint()->nNode--;
-nLen--; // End line character
-pNode = &pPaM->GetPoint()->nNode.GetNode();
+nLen = 0;
+break;
 }
-while( !pNode->IsTxtNode() && 
pPaM->GetPoint()->nNode >= 0 );
+
+--nLen; // End line character
+
+SwNode& rNode = pPaM->GetPoint()->nNode.GetNode();
 
 // Subtract previous text node's length
-if( pNode->IsTxtNode() )
+if (rNode.IsTxtNode())
 {
-pTxtNode = pNode->GetTxtNode();
-if( nLen < pTxtNode->Len() )
+pTxtNode = rNode.GetTxtNode();
+if (nLen < pTxtNode->Len())
 break;
 else
 nLen -= pTxtNode->Len();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-07-08 Thread Michael Stahl

 sw/source/filter/ww8/ww8par.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit ae2e7ad276acb9394691a9d4a702ed7a6b07b508
Author: Michael Stahl 
Date:   Tue Jul 8 13:05:41 2014 +0200

sw: do more input validation in SwWW8ImplReader::Read_And

(to fix up f2945255df273404ee2457dcf761cb8f334b732b)

Change-Id: Ie20fb9db4515b9737322ec7224ecd7e411d31c03

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 8289820..9408e2c 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2180,7 +2180,9 @@ long SwWW8ImplReader::Read_And(WW8PLCFManResult* pRes)
 //that relate to each annotation index as the parser passes
 //those points.
 sal_Int32 nLen = nEnd - nStart;
-if( nLen )
+// the start and end positions are apparently stored in
+// different arrays, so in an invalid file only one could exist
+if(SAL_MAX_INT32 != nEnd && SAL_MAX_INT32 != nStart && nLen > 
0)
 {
 if (pPaM->GetPoint()->nContent.GetIndex() >= nLen)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-07-08 Thread Laurent Godard

 sc/source/ui/view/output.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 902b7e9f192fab45cffc35d81cd0df0373a610ed
Author: Laurent Godard 
Date:   Tue Jul 8 12:25:26 2014 +0200

draw white border around note marks for fdo#81032

also translate the mark to make cell border visible

Change-Id: Ifa9f3befd1e25a66cc3443a3f33255603feea6a6
Reviewed-on: https://gerrit.libreoffice.org/10135
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index a3f0a7c..6b19602 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -2310,7 +2310,7 @@ void ScOutputData::DrawNoteMarks()
 {
 if (bFirst)
 {
-mpDev->SetLineColor();
+mpDev->SetLineColor(COL_WHITE);
 
 const StyleSettings& rStyleSettings = 
Application::GetSettings().GetStyleSettings();
 if ( mbUseStyleColor && 
rStyleSettings.GetHighContrastMode() )
@@ -2333,7 +2333,7 @@ void ScOutputData::DrawNoteMarks()
 }
 }
 if ( bLayoutRTL ? ( nMarkX >= 0 ) : ( nMarkX < nScrX+nScrW 
) )
-mpDev->DrawRect( Rectangle( 
nMarkX,nPosY,nMarkX+2*nLayoutSign,nPosY+2 ) );
+mpDev->DrawRect( Rectangle( 
nMarkX-5*nLayoutSign,nPosY,nMarkX+1*nLayoutSign,nPosY+6 ) );
 }
 
 nPosX += pRowInfo[0].pCellInfo[nX+1].nWidth * nLayoutSign;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

2014-07-08 Thread Norbert Thiebaud

 config_host.mk.in   |1 
 configure.ac|  138 
 solenv/gbuild/gbuild.mk |4 
 solenv/gbuild/platform/com_MSC_class.mk |5 -
 solenv/gbuild/platform/com_MSC_defs.mk  |   10 ++
 5 files changed, 106 insertions(+), 52 deletions(-)

New commits:
commit a89b8601ce7be0b6dc3f262661ea7802f2c725fd
Author: Norbert Thiebaud 
Date:   Tue Jul 1 12:13:07 2014 +

auto-detect the presence of a native gmake on windows

Change-Id: Ie1c7e022a2e1713a111ebd2db9db866e09f4f4f4
Reviewed-on: https://gerrit.libreoffice.org/10120
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/config_host.mk.in b/config_host.mk.in
index 72e1f8c..382a407 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -208,6 +208,7 @@ export GNUTLS_LIBS=$(gb_SPACE)@GNUTLS_LIBS@
 export PARALLELISM?=@PARALLELISM@
 @x_GNUCP@ export GNUCOPY=@GNUCP@
 export GNUMAKE=@GNUMAKE@
+export GNUMAKE_WIN_NATIVE=@GNUMAKE_WIN_NATIVE@
 export GNUPATCH=@GNUPATCH@
 export GNUTAR=@GNUTAR@
 export GOBJECT_CFLAGS=$(gb_SPACE)@GOBJECT_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 1a260ac..12e45dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,11 @@ PathFormat()
 fi
 done
 if test "$pf_conv_to_dos" = "yes"; then
-formatted_path=`cygpath -sm "$formatted_path"`
+if test "$GNUMAKE_WIN_NATIVE" = "TRUE" ; then
+formatted_path=`cygpath -sm "$formatted_path"`
+else
+formatted_path=`cygpath -d "$formatted_path"`
+fi
 if test $? -ne 0;  then
 AC_MSG_ERROR([path conversion failed for "$1".])
 fi
@@ -186,6 +190,57 @@ SRC_ROOT=`pwd`
 cd $BUILDDIR
 x_Cygwin=[\#]
 
+dnl ===
+dnl Search all the common names for GNU make
+dnl ===
+AC_MSG_CHECKING([for GNU make])
+
+# try to use our own make if it is available and GNUMAKE was not already 
defined
+if test -z "$GNUMAKE"; then
+if test -x "/opt/lo/bin/make"; then
+GNUMAKE="/opt/lo/bin/make"
+fi
+fi
+
+GNUMAKE_WIN_NATIVE=
+for a in "$MAKE" "$GNUMAKE" make gmake gnumake; do
+if test -n "$a"; then
+$a --version 2> /dev/null | grep GNU  2>&1 > /dev/null
+if test $? -eq 0;  then
+if test "$build_os" = "cygwin"; then
+if test -n "$($a -v | grep 'Built for Windows')" ; then
+GNUMAKE="$(cygpath -m "$(which "$(cygpath -u $a)")")"
+GNUMAKE_WIN_NATIVE="TRUE"
+else
+GNUMAKE=`which $a`
+fi
+else
+GNUMAKE=`which $a`
+fi
+break
+fi
+fi
+done
+AC_MSG_RESULT($GNUMAKE)
+if test -z "$GNUMAKE"; then
+AC_MSG_ERROR([not found. install GNU make.])
+else
+if test "$GNUMAKE_WIN_NATIVE" = "TRUE" ; then
+AC_MSG_NOTICE([Using a native Win32 gnumake version.])
+fi
+fi
+
+win_short_path_for_make()
+{
+local_short_path="$1"
+if test "$GNUMAKE_WIN_NATIVE" = "TRUE" ; then
+cygpath -sm "$local_short_path"
+else
+cygpath -u "$(cygpath -d "$local_short_path")"
+fi
+}
+
+
 if test "$build_os" = "cygwin"; then
 PathFormat "$SRC_ROOT"
 SRC_ROOT="$formatted_path"
@@ -2308,8 +2363,13 @@ pathmunge ()
 {
 if test -n "$1"; then
 if test "$build_os" = "cygwin"; then
-PathFormat "$1"
-new_path=`cygpath -sm "$formatted_path"`
+if test "$GNUMAKE_WIN_NATIVE" = "TRUE" ; then
+PathFormat "$1"
+new_path=`cygpath -sm "$formatted_path"`
+else
+PathFormat "$1"
+new_path=`cygpath -u "$formatted_path"`
+fi
 else
 new_path="$1"
 fi
@@ -3676,7 +3736,7 @@ if test "$_os" = "WINNT"; then
 fi
 fi
 
-VC_PRODUCT_DIR=`cygpath -sm "$VC_PRODUCT_DIR"`
+VC_PRODUCT_DIR=`win_short_path_for_make "$VC_PRODUCT_DIR"`
 AC_MSG_RESULT([$VC_PRODUCT_DIR])
 
 dnl ===
@@ -3726,7 +3786,7 @@ if test "$_os" = "WINNT"; then
 fi
 
 # This gives us a posix path with 8.3 filename restrictions
-CC=`cygpath -sm "$CC"`
+CC=`win_short_path_for_make "$CC"`
 fi
 
 if test -n "$CC"; then
@@ -4095,8 +4155,11 @@ cygwin*)
 GUIBASE=not-used
 OS=WNT
 RTL_OS=Windows
-P_SEP=";"
-
+if test "$GNUMAKE_WIN_NATIVE" = "TRUE" ; then
+P_SEP=";"
+else
+P_SEP=:
+fi
 case "$host_cpu" in
 i*86|x86_64)
 if test "$BITNESS_OVERRIDE" = 64; then
@@ -4967,36 +5030,6 @@ else
 fi
 AC_SUBST(ENABLE_PCH)
 
-dnl =

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

2014-07-08 Thread Michael Stahl

 Makefile.in |2 
 configure.ac|   69 +---
 solenv/gbuild/gbuild.mk |4 +
 solenv/gbuild/platform/com_MSC_class.mk |2 
 solenv/gbuild/platform/com_MSC_defs.mk  |4 -
 5 files changed, 54 insertions(+), 27 deletions(-)

New commits:
commit 2768d78391b0892ae1506687cfccdcc9c018077c
Author: Michael Stahl 
Date:   Wed Jun 4 22:21:53 2014 +0200

configure, gbuild: remove Cygwin paths from make environment

All environment variables contain native Win32 paths.

This allows building with Win32 make and Cygwin sh.exe,
but Cygwin make cannot build any more with the Win32 entries in PATH.

Requires adding "bash" detection to configure since /usr/bin/env
can't be invoked by Win32 make and it's possible to install cygwin
somewhere else than C:/cygwin.

Change-Id: Ia8f4ee3c91222e8f5919cfbfc452f12ffbfadd40
Reviewed-on: https://gerrit.libreoffice.org/9698
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/Makefile.in b/Makefile.in
index 381e270..915e11c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -15,7 +15,7 @@ build_goal:=$(if $(filter build check,$(MAKECMDGOALS)),all)\
  $(if $(filter check,$(MAKECMDGOALS)),subsequentcheck)\
  $(filter all build-l10n-only build-non-l10n-only debugrun help slowcheck 
translations unitcheck subsequentcheck check packageinfo,$(MAKECMDGOALS))
 
-SHELL=/usr/bin/env bash
+SHELL := @SHELL_BASH@
 SRCDIR := @SRC_ROOT@
 BUILDDIR := @BUILDDIR@
 GIT_BUILD := $(if $(wildcard $(SRCDIR)/.git),T)
diff --git a/configure.ac b/configure.ac
index 557dbe3..1a260ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,7 @@ PathFormat()
 fi
 done
 if test "$pf_conv_to_dos" = "yes"; then
-formatted_path=`cygpath -d "$formatted_path"`
+formatted_path=`cygpath -sm "$formatted_path"`
 if test $? -ne 0;  then
 AC_MSG_ERROR([path conversion failed for "$1".])
 fi
@@ -2309,15 +2309,15 @@ pathmunge ()
 if test -n "$1"; then
 if test "$build_os" = "cygwin"; then
 PathFormat "$1"
-new_path=`cygpath -u "$formatted_path"`
+new_path=`cygpath -sm "$formatted_path"`
 else
 new_path="$1"
 fi
 if ! echo "$LO_PATH" | $EGREP -q "(^|:)$1($|:)"; then
 if test "$2" = "after"; then
-LO_PATH="$LO_PATH:$new_path"
+LO_PATH="$LO_PATH${P_SEP}$new_path"
 else
-LO_PATH="$new_path:$LO_PATH"
+LO_PATH="$new_path${P_SEP}$LO_PATH"
 fi
 fi
 unset new_path
@@ -3676,8 +3676,7 @@ if test "$_os" = "WINNT"; then
 fi
 fi
 
-VC_PRODUCT_DIR=`cygpath -d "$VC_PRODUCT_DIR"`
-VC_PRODUCT_DIR=`cygpath -u "$VC_PRODUCT_DIR"`
+VC_PRODUCT_DIR=`cygpath -sm "$VC_PRODUCT_DIR"`
 AC_MSG_RESULT([$VC_PRODUCT_DIR])
 
 dnl ===
@@ -3727,8 +3726,7 @@ if test "$_os" = "WINNT"; then
 fi
 
 # This gives us a posix path with 8.3 filename restrictions
-CC=`cygpath -d "$CC"`
-CC=`cygpath -u "$CC"`
+CC=`cygpath -sm "$CC"`
 fi
 
 if test -n "$CC"; then
@@ -4985,7 +4983,11 @@ for a in "$MAKE" "$GNUMAKE" make gmake gnumake; do
 if test -n "$a"; then
 $a --version 2> /dev/null | grep GNU  2>&1 > /dev/null
 if test $? -eq 0;  then
-GNUMAKE=`which $a`
+if test "$build_os" = "cygwin"; then
+GNUMAKE=$(cygpath -m $(which $(cygpath -u $a)))
+else
+GNUMAKE=`which $a`
+fi
 break
 fi
 fi
@@ -5060,6 +5062,9 @@ fi
 # find if gnumake support file function
 AC_MSG_CHECKING([whether GNU make supports the 'file' function])
 TESTGMAKEFILEFUNC="`mktemp -d -t tst.XX`"
+if test "$build_os" = "cygwin"; then
+TESTGMAKEFILEFUNC=`cygpath -m $TESTGMAKEFILEFUNC`
+fi
 $SED -e "s//$TAB/" > $TESTGMAKEFILEFUNC/Makefile << EOF
 \$(file >test.txt,Success )
 
@@ -5086,6 +5091,13 @@ if test "$_make_ver_check" = ""; then
STALE_MAKE=TRUE
 fi
 
+if test "$build_os" = "cygwin"; then
+SHELL_BASH=$(cygpath -m $(which bash))
+else
+SHELL_BASH=`which bash`
+fi
+AC_SUBST(SHELL_BASH)
+
 HAVE_LD_HASH_STYLE=FALSE
 WITH_LINKER_HASH_STYLE=
 AC_MSG_CHECKING( for --hash-style gcc linker support )
@@ -5382,8 +5394,7 @@ if test "$build_os" = "cygwin"; then
 fi
 
 # Convert to posix path with 8.3 filename restrictions ( No spaces )
-MIDL_PATH=`cygpath -d "$MIDL_PATH"`
-MIDL_PATH=`cygpath -u "$MIDL_PATH"`
+MIDL_PATH=`cygpath -sm "$MIDL_PATH"`
 
 dnl Check csc.exe
 AC_MSG_CHECKING([for csc.exe])
@@ -5397,8 +5408,7 @@ if test "$build_os" = "cygwin"; then
 AC_MSG_RESULT([$CSC_PATH/csc.exe])

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - vcl/win

2014-07-08 Thread Tor Lillqvist

 vcl/win/source/window/salframe.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b5ca532c6d9ebaf8ebe556e9f1cfdfb666f64526
Author: Tor Lillqvist 
Date:   Tue Jul 8 10:17:48 2014 +0300

Fix some OUString construction error with VS2013

A bit unclear to me whether the code really did what was intended with
earlier VS versions either.

VS2013 said: error C2664: 'rtl::OUString::OUString(const sal_uInt32
*,sal_Int32)' : cannot convert argument 1 from 'const char *' to
'const rtl::OUString &'

Reason: cannot convert from 'const char *' to 'const rtl::OUString'

No constructor could take the source type, or constructor overload
resolution was ambiguous

Change-Id: Ie23d8382515064062a3ed46418d9d4a977b35d28
(cherry picked from commit eee44c951c104da342d55fd4de634efd51ae59ae)
Signed-off-by: Michael Stahl 

diff --git a/vcl/win/source/window/salframe.cxx 
b/vcl/win/source/window/salframe.cxx
index d9f57b8..37ab712 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -4612,7 +4612,7 @@ static int ImplMenuChar( HWND, WPARAM wParam, LPARAM 
lParam )
 {
 int nRet = MNC_IGNORE;
 HMENU hMenu = (HMENU) lParam;
-OUString aMnemonic( "&" + (sal_Unicode) LOWORD(wParam) );
+OUString aMnemonic( "&" + OUString((sal_Unicode) LOWORD(wParam)) );
 aMnemonic = aMnemonic.toAsciiLowerCase();   // we only have ascii mnemonics
 
 // search the mnemonic in the current menu
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - vcl/win

2014-07-08 Thread Tor Lillqvist

 vcl/win/source/window/salframe.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cdce546b9746de0f42df8e8dad86008ff13c74e0
Author: Tor Lillqvist 
Date:   Tue Jul 8 10:17:48 2014 +0300

Fix some OUString construction error with VS2013

A bit unclear to me whether the code really did what was intended with
earlier VS versions either.

VS2013 said: error C2664: 'rtl::OUString::OUString(const sal_uInt32
*,sal_Int32)' : cannot convert argument 1 from 'const char *' to
'const rtl::OUString &'

Reason: cannot convert from 'const char *' to 'const rtl::OUString'

No constructor could take the source type, or constructor overload
resolution was ambiguous

Change-Id: Ie23d8382515064062a3ed46418d9d4a977b35d28
(cherry picked from commit eee44c951c104da342d55fd4de634efd51ae59ae)
Reviewed-on: https://gerrit.libreoffice.org/10133
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/vcl/win/source/window/salframe.cxx 
b/vcl/win/source/window/salframe.cxx
index 9cd8fa2..e2620aa 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -4441,7 +4441,7 @@ static int ImplMenuChar( HWND, WPARAM wParam, LPARAM 
lParam )
 {
 int nRet = MNC_IGNORE;
 HMENU hMenu = (HMENU) lParam;
-OUString aMnemonic( "&" + (sal_Unicode) LOWORD(wParam) );
+OUString aMnemonic( "&" + OUString((sal_Unicode) LOWORD(wParam)) );
 aMnemonic = aMnemonic.toAsciiLowerCase();   // we only have ascii mnemonics
 
 // search the mnemonic in the current menu
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-07-08 Thread Tor Lillqvist

 filter/source/msfilter/dffpropset.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 579d9ae1c5873f78dbe0364c83842de8556f6ccb
Author: Tor Lillqvist 
Date:   Tue Jul 8 12:06:48 2014 +0300

Include  for std::min()

Change-Id: Ieb01023b93923777cf53a2fc8d7198d88422e8a4

diff --git a/filter/source/msfilter/dffpropset.cxx 
b/filter/source/msfilter/dffpropset.cxx
index 99b33d5..ffa3370 100644
--- a/filter/source/msfilter/dffpropset.cxx
+++ b/filter/source/msfilter/dffpropset.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
 #include 
 #include 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - filter/source sal/Module_sal.mk vcl/win

2014-07-08 Thread Tor Lillqvist

 filter/source/xsltfilter/LibXSLTTransformer.cxx |2 +-
 sal/Module_sal.mk   |2 +-
 vcl/win/source/window/salframe.cxx  |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 845e8427fce66ad26a6b31219b9e1f13e7256c3f
Author: Tor Lillqvist 
Date:   Tue Jul 8 11:25:42 2014 +0300

Include  for std::min() and max()

Change-Id: I88a590344292b4adf562ca83f5072d543b5924ad

diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx 
b/filter/source/xsltfilter/LibXSLTTransformer.cxx
index de259dd..d0d850f 100644
--- a/filter/source/xsltfilter/LibXSLTTransformer.cxx
+++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx
@@ -8,7 +8,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-
+#include 
 #include 
 #include 
 #include 
commit b139eefeef9cfe3dd45228cd2b73d0cfd08d9bf3
Author: Tor Lillqvist 
Date:   Tue Jul 8 11:13:46 2014 +0300

Bypass CppunitTest_sal_osl_security with VS2013 for now, hangs

Change-Id: I8500b0cc4e541c96124425b713ba96226ff4715d

diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
index 139ca5e..2cfbaee 100644
--- a/sal/Module_sal.mk
+++ b/sal/Module_sal.mk
@@ -40,7 +40,7 @@ $(eval $(call gb_Module_add_check_targets,sal,\
CppunitTest_sal_osl_file) \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,CppunitTest_sal_osl_module) \
CppunitTest_sal_osl_old_test_file \
-   CppunitTest_sal_osl_security \
+   $(if $(filter-out 
MSC-120,$(COM)-$(VCVER)),CppunitTest_sal_osl_security) \
CppunitTest_sal_osl_thread \
CppunitTest_sal_rtl_alloc \
CppunitTest_sal_rtl_process \
commit eee44c951c104da342d55fd4de634efd51ae59ae
Author: Tor Lillqvist 
Date:   Tue Jul 8 10:17:48 2014 +0300

Fix some OUString construction error with VS2013

A bit unclear to me whether the code really did what was intended with
earlier VS versions either.

VS2013 said: error C2664: 'rtl::OUString::OUString(const sal_uInt32
*,sal_Int32)' : cannot convert argument 1 from 'const char *' to
'const rtl::OUString &'

Reason: cannot convert from 'const char *' to 'const rtl::OUString'

No constructor could take the source type, or constructor overload
resolution was ambiguous

Change-Id: Ie23d8382515064062a3ed46418d9d4a977b35d28

diff --git a/vcl/win/source/window/salframe.cxx 
b/vcl/win/source/window/salframe.cxx
index 9cd8fa2..e2620aa 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -4441,7 +4441,7 @@ static int ImplMenuChar( HWND, WPARAM wParam, LPARAM 
lParam )
 {
 int nRet = MNC_IGNORE;
 HMENU hMenu = (HMENU) lParam;
-OUString aMnemonic( "&" + (sal_Unicode) LOWORD(wParam) );
+OUString aMnemonic( "&" + OUString((sal_Unicode) LOWORD(wParam)) );
 aMnemonic = aMnemonic.toAsciiLowerCase();   // we only have ascii mnemonics
 
 // search the mnemonic in the current menu
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-07-08 Thread Michael Meeks

 configmgr/source/nodemap.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 58ceb16141eb003d921049cc231578ff2d685e60
Author: Michael Meeks 
Date:   Tue Jul 8 09:39:03 2014 +0100

configmgr: fix node cache clearing.

Change-Id: Idd6c227b8f50446c1d3c48385de6c843faf47466

diff --git a/configmgr/source/nodemap.hxx b/configmgr/source/nodemap.hxx
index dcfac2b..a000b30 100644
--- a/configmgr/source/nodemap.hxx
+++ b/configmgr/source/nodemap.hxx
@@ -52,8 +52,8 @@ class NodeMap
 iterator end() { return maImpl.end(); }
 const_iterator end() const { return maImpl.end(); }
 
-rtl::Reference &operator[](const OUString &aStr) { return 
maImpl[aStr]; /* clearCache(); */ }
-std::pair insert(const value_type &vt) { return 
maImpl.insert(vt); /* clearCache(); */ }
+rtl::Reference &operator[](const OUString &aStr) { clearCache(); 
return maImpl[aStr]; }
+std::pair insert(const value_type &vt) { clearCache(); 
return maImpl.insert(vt); }
 void clear() { maImpl.clear(); clearCache(); }
 void erase(const iterator &it) { maImpl.erase(it); clearCache(); }
 void erase(const OUString &aStr) { maImpl.erase(aStr); clearCache(); }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 75025] LibreOffice 4.3 most annoying bugs

2014-07-08 Thread bugzilla-daemon

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

Cor Nouws  changed:

   What|Removed |Added

 Depends on||80020

--- Comment #37 from Cor Nouws  ---
Adding Bug 80020 - FORMATTING: lost of style inheritance
(drama when using Draw and Impress :( )

-- 
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: lotuswordpro/source

2014-07-08 Thread Stephan Bergmann

 lotuswordpro/source/filter/bencont.cxx |4 ++--
 lotuswordpro/source/filter/benlist.cxx |8 
 lotuswordpro/source/filter/benname.cxx |2 +-
 lotuswordpro/source/filter/benobj.cxx  |2 +-
 lotuswordpro/source/filter/bento.hxx   |   14 +++---
 lotuswordpro/source/filter/first.hxx   |4 ++--
 lotuswordpro/source/filter/tocread.cxx |6 +++---
 7 files changed, 20 insertions(+), 20 deletions(-)

New commits:
commit 44fb7631cc03bbab655391593d248ba3875f308b
Author: Stephan Bergmann 
Date:   Tue Jul 8 10:22:20 2014 +0200

Avoid undefined downcasts to wrong type

...CUtList::cDummyElmt is always only of type CUtListElmt, not a derived 
type.

Change-Id: Ibc372642e2a53c548421b5cfa7cc496986036815

diff --git a/lotuswordpro/source/filter/bencont.cxx 
b/lotuswordpro/source/filter/bencont.cxx
index 1033f67..340b7cc 100644
--- a/lotuswordpro/source/filter/bencont.cxx
+++ b/lotuswordpro/source/filter/bencont.cxx
@@ -117,7 +117,7 @@ BenError
 LtcBenContainer::RegisterPropertyName(const char * sPropertyName,
   pCBenPropertyName * ppPropertyName)
 {
-pCBenNamedObjectListElmt pPrevNamedObjectListElmt;
+pCUtListElmt pPrevNamedObjectListElmt;
 pCBenNamedObject pNamedObject = FindNamedObject(&cNamedObjects,
   sPropertyName, &pPrevNamedObjectListElmt);
 
@@ -129,7 +129,7 @@ LtcBenContainer::RegisterPropertyName(const char * 
sPropertyName,
 }
 else
 {
-pCBenIDListElmt pPrevObject;
+pCUtListElmt pPrevObject;
 if (FindID(&cObjects, cNextAvailObjectID, &pPrevObject) != NULL)
 return BenErr_DuplicateObjectID;
 
diff --git a/lotuswordpro/source/filter/benlist.cxx 
b/lotuswordpro/source/filter/benlist.cxx
index 39943c4..2e3fcd1 100644
--- a/lotuswordpro/source/filter/benlist.cxx
+++ b/lotuswordpro/source/filter/benlist.cxx
@@ -59,7 +59,7 @@ namespace OpenStormBento
 
 pCBenNamedObject
 FindNamedObject(pCUtList pList, const char * sName,
-  pCBenNamedObjectListElmt * ppPrev)
+  pCUtListElmt * ppPrev)
 {
 CUtListElmt& rTerminating = pList->GetTerminating();
 for (pCUtListElmt pCurr = pList->GetLast(); pCurr != &rTerminating;
@@ -84,13 +84,13 @@ FindNamedObject(pCUtList pList, const char * sName,
 }
 
 if (ppPrev != NULL)
-*ppPrev = (pCBenNamedObjectListElmt) &rTerminating;
+*ppPrev = &rTerminating;
 return NULL;
 }
 
 // Assume list is of BenIDListElmt list elements, sorted by ID
 pCBenIDListElmt
-FindID(pCUtList pList, BenObjectID ObjectID, pCBenIDListElmt * ppPrev)
+FindID(pCUtList pList, BenObjectID ObjectID, pCUtListElmt * ppPrev)
 {
 CUtListElmt& rTerminating = pList->GetTerminating();
 for (pCUtListElmt pCurr = pList->GetLast(); pCurr != &rTerminating;
@@ -111,7 +111,7 @@ FindID(pCUtList pList, BenObjectID ObjectID, 
pCBenIDListElmt * ppPrev)
 }
 
 if (ppPrev != NULL)
-*ppPrev = (pCBenIDListElmt) &rTerminating;
+*ppPrev = &rTerminating;
 return NULL;
 }
 } //end namespace OpenStormBento
diff --git a/lotuswordpro/source/filter/benname.cxx 
b/lotuswordpro/source/filter/benname.cxx
index 24806ad..b8ecab7 100644
--- a/lotuswordpro/source/filter/benname.cxx
+++ b/lotuswordpro/source/filter/benname.cxx
@@ -59,7 +59,7 @@ namespace OpenStormBento
 // changed to remove warning
 CBenNamedObject::CBenNamedObject(pLtcBenContainer pContainer,
   BenObjectID ObjectID, pCBenObject pPrevObject, const char * sName,
-  pCBenNamedObjectListElmt pPrevNamedObjectListElmt)
+  pCUtListElmt pPrevNamedObjectListElmt)
 : CBenObject(pContainer, ObjectID, pPrevObject)
 , csName(sName)
 , cNameListElmt(pPrevNamedObjectListElmt)
diff --git a/lotuswordpro/source/filter/benobj.cxx 
b/lotuswordpro/source/filter/benobj.cxx
index f9efc90..500fe73 100644
--- a/lotuswordpro/source/filter/benobj.cxx
+++ b/lotuswordpro/source/filter/benobj.cxx
@@ -66,7 +66,7 @@ CBenObject::IsNamedObject()
 pCBenProperty
 CBenObject::UseProperty(BenObjectID PropertyID)
 {
-pCBenIDListElmt pPrev;
+pCUtListElmt pPrev;
 return (pCBenProperty) FindID(&cProperties, PropertyID, &pPrev);
 }
 
diff --git a/lotuswordpro/source/filter/bento.hxx 
b/lotuswordpro/source/filter/bento.hxx
index 6775331..ec6abfe 100644
--- a/lotuswordpro/source/filter/bento.hxx
+++ b/lotuswordpro/source/filter/bento.hxx
@@ -144,7 +144,7 @@ sal_uLong BenOpenContainer(LwpSvStream * pStream, 
pLtcBenContainer * ppContainer
 class CBenIDListElmt : public CUtListElmt
 {
 public: // Internal methods
-CBenIDListElmt(BenObjectID ID, pCBenIDListElmt pPrev) : CUtListElmt(pPrev)
+CBenIDListElmt(BenObjectID ID, pCUtListElmt pPrev) : CUtListElmt(pPrev)
   { cID = ID; }
 CBenIDListElmt(BenObjectID ID) { cID = ID; }
 BenObjectID GetID() { return cID; }
@@ -157,7 +157,7 @@ class CBenNamedObjectListElmt : public CUtListElmt
 {
 public: // Methods
 // added to remove warning
-CBenNamedObjectListElmt(pCBenNamedObjectListElmt pPrev) : 
CUtListElmt(pPrev)
+CBenNamedObjectListElmt(pCUtListElmt pPr

[Libreoffice-commits] core.git: Branch 'feature/calctiledrendering3' - 8 commits - libreofficekit/Executable_gtktiledviewer.mk libreofficekit/qa libreofficekit/source sc/source vcl/headless

2014-07-08 Thread Andrzej Hunt

Rebased ref, commits from common ancestor:
commit f6cb31b92951534711ffa501baba7b13e8f496bd
Author: Andrzej Hunt 
Date:   Tue Jul 8 09:53:42 2014 +0200

gtktiledviewer: allow selecting between normal and quad-tile view.

Change-Id: I85b22b93fe4ce2ffb62df8766ceea7a1bd8961ee

diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx 
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index bc4ad09..3a232e8 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -14,6 +14,7 @@
 #include 
 
 #include 
+#include "../lokdocview_quad/lokdocview_quad.h"
 
 static int help()
 {
@@ -22,6 +23,10 @@ static int help()
 }
 
 static GtkWidget* pDocView;
+static GtkWidget* pDocViewQuad;
+static GtkWidget* pVBox;
+static LibreOfficeKit* pOffice;
+static char* pFileName;
 
 const float fZooms[] = { 0.25, 0.5, 0.75, 1.0, 1.5, 2.0, 3.0, 5.0 };
 
@@ -30,7 +35,17 @@ void changeZoom( GtkWidget* pButton, gpointer /* pItem */ )
 const char *sName = gtk_tool_button_get_stock_id( GTK_TOOL_BUTTON(pButton) 
);
 
 float fZoom = 0;
-const float fCurrentZoom = lok_docview_get_zoom( LOK_DOCVIEW(pDocView) );
+float fCurrentZoom;
+
+if ( pDocView )
+{
+fCurrentZoom = lok_docview_get_zoom( LOK_DOCVIEW(pDocView) );
+}
+else if ( pDocViewQuad )
+{
+fCurrentZoom = lok_docview_quad_get_zoom( LOK_DOCVIEW_QUAD(pDocView) );
+}
+
 if ( strcmp(sName, "gtk-zoom-in") == 0)
 {
 for ( unsigned int i = 0; i < sizeof( fZooms ) / sizeof( fZooms[0] ); 
i++ )
@@ -63,10 +78,46 @@ void changeZoom( GtkWidget* pButton, gpointer /* pItem */ )
 
 if ( fZoom != 0 )
 {
-lok_docview_set_zoom( LOK_DOCVIEW(pDocView), fZoom );
+if ( pDocView )
+{
+lok_docview_set_zoom( LOK_DOCVIEW(pDocView), fZoom );
+}
+else if ( pDocViewQuad )
+{
+lok_docview_quad_set_zoom( LOK_DOCVIEW_QUAD(pDocViewQuad), fZoom );
+}
 }
 }
 
+void changeQuadView( GtkWidget* /*pButton*/, gpointer /* pItem */ )
+{
+if ( pDocView )
+{
+const float fCurrentZoom = lok_docview_get_zoom( LOK_DOCVIEW(pDocView) 
);
+gtk_widget_destroy( pDocView );
+pDocView = 0;
+pDocViewQuad = lok_docview_quad_new( pOffice );
+gtk_container_add( GTK_CONTAINER(pVBox), pDocViewQuad );
+gtk_widget_show( pDocViewQuad );
+
+lok_docview_quad_set_zoom( LOK_DOCVIEW_QUAD(pDocViewQuad), 
fCurrentZoom );
+lok_docview_quad_open_document( LOK_DOCVIEW_QUAD(pDocViewQuad), 
pFileName );
+}
+else if ( pDocViewQuad )
+{
+const float fCurrentZoom = lok_docview_quad_get_zoom( 
LOK_DOCVIEW_QUAD(pDocViewQuad) );
+gtk_widget_destroy( pDocViewQuad );
+pDocViewQuad = 0;
+pDocView = lok_docview_new( pOffice );
+gtk_container_add( GTK_CONTAINER(pVBox), pDocView );
+gtk_widget_show( pDocView );
+
+lok_docview_set_zoom( LOK_DOCVIEW(pDocView), fCurrentZoom );
+lok_docview_open_document( LOK_DOCVIEW(pDocView), pFileName );
+}
+}
+
+
 int main( int argc, char* argv[] )
 {
 if( argc < 2 ||
@@ -79,7 +130,7 @@ int main( int argc, char* argv[] )
 return 1;
 }
 
-LibreOfficeKit* pOffice = lok_init( argv[1] );
+pOffice = lok_init( argv[1] );
 
 gtk_init( &argc, &argv );
 
@@ -88,7 +139,7 @@ int main( int argc, char* argv[] )
 gtk_window_set_default_size(GTK_WINDOW(pWindow), 800, 600);
 g_signal_connect( pWindow, "destroy", G_CALLBACK(gtk_main_quit), NULL );
 
-GtkWidget* pVBox = gtk_vbox_new( FALSE, 0 );
+pVBox = gtk_vbox_new( FALSE, 0 );
 gtk_container_add( GTK_CONTAINER(pWindow), pVBox );
 
 // Toolbar
@@ -111,17 +162,27 @@ int main( int argc, char* argv[] )
 gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), pZoomOut, -1);
 g_signal_connect( G_OBJECT(pZoomOut), "clicked", G_CALLBACK(changeZoom), 
NULL );
 
+GtkToolItem* pSeparator1 = gtk_separator_tool_item_new();
+gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), pSeparator1, -1);
+
+GtkToolItem* pEnableQuadView = gtk_toggle_tool_button_new();
+gtk_tool_button_set_label( GTK_TOOL_BUTTON(pEnableQuadView), "Use Quad 
View" );
+gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), pEnableQuadView, -1 );
+g_signal_connect( G_OBJECT(pEnableQuadView), "toggled", 
G_CALLBACK(changeQuadView), NULL );
+
 gtk_box_pack_start( GTK_BOX(pVBox), pToolbar, FALSE, FALSE, 0 ); // Adds 
to top.
 
 // Docview
 pDocView = lok_docview_new( pOffice );
+pDocViewQuad = 0;
 gtk_container_add( GTK_CONTAINER(pVBox), pDocView );
 
 gtk_widget_show_all( pWindow );
 
+pFileName = argv[2];
 lok_docview_open_document( LOK_DOCVIEW(pDocView), argv[2] );
 
 gtk_main();
 
 return 0;
-}
\ No newline at end of file
+}
commit be938f8ccac5332a719ed67d39f751b009d7d099
Author: Andrzej Hunt 
Date:   Tue Jul 8 09:44:40 2014 +0200

Quad Docview: only reren

Re: [GSoC] Dialog Widget Conversion - Week 7

2014-07-08 Thread Caolán McNamara

On Mon, 2014-07-07 at 18:44 +0200, Mihály Palenik wrote:
> 
> In RID_CONDFORMAT there is a control called WIN_CONDITION and I also
> converted(but not work very well).

I'm working on this one now. The major trick is that the
condPlaygroundDrawingarea widget has to be some form or layout aware
widget in order that the conditionwin.ui children get the layout request
delivered.

C.

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

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - ucb/source

2014-07-08 Thread Matúš Kukan

 ucb/source/ucp/webdav/webdavcontent.cxx |   12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 8b568c19a68d080685cf5a429dbe08263e8e6cee
Author: MatÃºÅ¡ Kukan 
Date:   Tue Jul 8 09:00:51 2014 +0200

webdav: fix locking in webdav_ucp::Content::getResourceType()

This commit cherry-picks 49a454225e35699d7351faaba3d296e1858c6107
for serf webdav version.

Change-Id: Ic5aba4fba8f8a2a521224b08865500dd932e85bf
(cherry picked from commit 9da4e46957bd1a69c4339eeb1d107546c400e6e3)

diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx 
b/ucb/source/ucp/webdav/webdavcontent.cxx
index f053874..e67b65e 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -3448,7 +3448,17 @@ const Content::ResourceType & Content::getResourceType(
 const uno::Reference< ucb::XCommandEnvironment >& xEnv )
 throw ( uno::Exception )
 {
-return getResourceType( xEnv, m_xResAccess );
+boost::scoped_ptr< DAVResourceAccess > xResAccess;
+{
+osl::MutexGuard aGuard( m_aMutex );
+xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) );
+}
+const Content::ResourceType & ret = getResourceType( xEnv, xResAccess );
+{
+osl::Guard< osl::Mutex > aGuard( m_aMutex );
+m_xResAccess.reset( new DAVResourceAccess( *xResAccess.get() ) );
+}
+return ret;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65675] LibreOffice 4.2 most annoying bugs

2014-07-08 Thread bugzilla-daemon

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

--- Comment #176 from Joel Madero  ---
Added bug 76595 - regression

Deleting an image from a docx file and then saving as a native odt results in
the file reappearing after closing the file and reopening it. Test file and
bibisect on bug

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

2014-07-08 Thread bugzilla-daemon

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

Joel Madero  changed:

   What|Removed |Added

 Depends on||76595

-- 
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: ucb/source

2014-07-08 Thread Matúš Kukan

 ucb/source/ucp/webdav/webdavcontent.cxx |   12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 9da4e46957bd1a69c4339eeb1d107546c400e6e3
Author: MatÃºÅ¡ Kukan 
Date:   Tue Jul 8 09:00:51 2014 +0200

webdav: fix locking in webdav_ucp::Content::getResourceType()

This commit cherry-picks 49a454225e35699d7351faaba3d296e1858c6107
for serf webdav version.

Change-Id: Ic5aba4fba8f8a2a521224b08865500dd932e85bf

diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx 
b/ucb/source/ucp/webdav/webdavcontent.cxx
index faca565..3829a0c 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -3410,7 +3410,17 @@ const Content::ResourceType & Content::getResourceType(
 const uno::Reference< ucb::XCommandEnvironment >& xEnv )
 throw ( uno::Exception )
 {
-return getResourceType( xEnv, m_xResAccess );
+boost::scoped_ptr< DAVResourceAccess > xResAccess;
+{
+osl::MutexGuard aGuard( m_aMutex );
+xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) );
+}
+const Content::ResourceType & ret = getResourceType( xEnv, xResAccess );
+{
+osl::Guard< osl::Mutex > aGuard( m_aMutex );
+m_xResAccess.reset( new DAVResourceAccess( *xResAccess.get() ) );
+}
+return ret;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-07-08 Thread Tor Lillqvist

 vcl/source/glyphs/graphite_layout.cxx |   16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)

New commits:
commit ba27300d419786ca6fa8a7df950d01f472de3314
Author: Tor Lillqvist 
Date:   Tue Jul 8 09:49:50 2014 +0300

Fix some round() confusion

Why insist on using the same name as a standard function? Causes
confusion with VS2013 at least, "ambiguous call to overloaded
function."

Sure, this might be caused by a bug in the compiler (or its
headers). Or maybe vagueness in the language definition? Who cares, I
still claim that intentionally writing an own function called round()
is asking for problems. So rename it to round_to_long().

(And then the return value of calls to this function, which is of type
'long', is assigned in a couple of places to variables of type 'int',
fun... Intentional, knowing there will be no overflow, or a bug
waiting to happen?)

Change-Id: If15d44f10f9f05de1c7c79492baf158eee770b8b

diff --git a/vcl/source/glyphs/graphite_layout.cxx 
b/vcl/source/glyphs/graphite_layout.cxx
index b365eb3..76f7050 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -40,6 +40,8 @@
 #include 
 
 // Platform
+#include 
+
 #include 
 
 #include 
@@ -86,7 +88,7 @@ static FILE * grLog()
 
 namespace
 {
-inline long round(const float n) {
+inline long round_to_long(const float n) {
 return long(n + (n < 0 ? -0.5 : 0.5));
 }
 
@@ -344,8 +346,8 @@ GraphiteLayout::fillFrom(gr_segment * pSegment, 
ImplLayoutArgs &rArgs, float fSc
 baseSlot = gr_slot_next_sibling_attachment(baseSlot);
 }
 }
-long nXOffset = round(fMinX * fScaling);
-mnWidth = round(fMaxX * fScaling) - nXOffset + nDxOffset;
+long nXOffset = round_to_long(fMinX * fScaling);
+mnWidth = round_to_long(fMaxX * fScaling) - nXOffset + nDxOffset;
 if (mnWidth < 0)
 {
 // This can happen when there was no base inside the range
@@ -416,8 +418,8 @@ GraphiteLayout::append(gr_segment *pSeg, ImplLayoutArgs 
&rArgs,
 nextOrigin = nextGlyphOrigin;
 long glyphId = gr_slot_gid(gi);
 long deltaOffset = 0;
-int scaledGlyphPos = round(gr_slot_origin_X(gi) * scaling);
-int glyphWidth = round((nextOrigin - gOrigin) * scaling);
+int scaledGlyphPos = round_to_long(gr_slot_origin_X(gi) * scaling);
+int glyphWidth = round_to_long((nextOrigin - gOrigin) * scaling);
 //if (glyphWidth < 0)
 //{
 //nextOrigin = gOrigin;
@@ -459,11 +461,11 @@ GraphiteLayout::append(gr_segment *pSeg, ImplLayoutArgs 
&rArgs,
 GlyphItem aGlyphItem(mvGlyphs.size(),
 glyphId,
 Point(scaledGlyphPos + rDXOffset,
-round((-gr_slot_origin_Y(gi) * scaling))),
+round_to_long((-gr_slot_origin_Y(gi) * scaling))),
 nGlyphFlags,
 glyphWidth);
 if (glyphId != static_cast(GF_DROPPED))
-aGlyphItem.mnOrigWidth = round(gr_slot_advance_X(gi, mpFace, mpFont) * 
scaling);
+aGlyphItem.mnOrigWidth = round_to_long(gr_slot_advance_X(gi, mpFace, 
mpFont) * scaling);
 mvGlyphs.push_back(aGlyphItem);
 
 // update the offset if this glyph was dropped
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

66 matches

Mail list logo