[Libreoffice-commits] .: Branch 'libreoffice-3-5' - basic/source

2012-01-06 Thread David Tardon 
 basic/source/runtime/methods.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e4851f276624340401c0556015d681e574b178a6
Author: August Sodora aug...@gmail.com
Date:   Thu Jan 5 14:45:10 2012 -0500

fdo#44172: Basic function VAL produces bad result

Signed-off-by: David Tardon dtar...@redhat.com

diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index e3d5d48..352351e 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -128,7 +128,7 @@ static void FilterWhiteSpace( String rStr )
 if (!rStr.Len())
 return;
 
-rtl::OUStringBuffer aRet(rStr);
+rtl::OUStringBuffer aRet;
 
 for (xub_StrLen i = 0; i  rStr.Len(); ++i)
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

2012-01-06 Thread Cédric Bosdonnat 
 sw/source/core/edit/edtox.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 41cd78b805a36d5676b2075a4860e9aee7bc5491
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date:   Fri Jan 6 10:01:22 2012 +0100

fdo#32726: search for index entries in the whole document, not only the body

diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx
index 6ce4b44..3a178ed 100644
--- a/sw/source/core/edit/edtox.cxx
+++ b/sw/source/core/edit/edtox.cxx
@@ -428,7 +428,7 @@ void SwEditShell::ApplyAutoMark()
 // todo/mba: assuming that notes shouldn't be searched
 sal_Bool bSearchInNotes = sal_False;
 sal_uLong nRet = Find( aSearchOpt,  bSearchInNotes, 
DOCPOS_START, DOCPOS_END, bCancel,
-
(FindRanges)(FND_IN_SELALL|FND_IN_BODYONLY),
+
(FindRanges)(FND_IN_SELALL|FND_IN_BODYONLY|FND_IN_OTHER),
 sal_False );
 
 if(nRet)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source

2012-01-06 Thread Cédric Bosdonnat 
 sw/source/core/edit/edtox.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 376488f5747cdbcfc4905aa12a531a266303658d
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date:   Fri Jan 6 10:01:22 2012 +0100

fdo#32726: search for index entries in the whole document, not only the body

diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx
index ba104fc..282becc 100644
--- a/sw/source/core/edit/edtox.cxx
+++ b/sw/source/core/edit/edtox.cxx
@@ -430,7 +430,7 @@ void SwEditShell::ApplyAutoMark()
 // todo/mba: assuming that notes shouldn't be searched
 sal_Bool bSearchInNotes = sal_False;
 sal_uLong nRet = Find( aSearchOpt,  bSearchInNotes, 
DOCPOS_START, DOCPOS_END, bCancel,
-
(FindRanges)(FND_IN_SELALL|FND_IN_BODYONLY),
+
(FindRanges)(FND_IN_SELALL|FND_IN_BODYONLY|FND_IN_OTHER),
 sal_False );
 
 if(nRet)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-01-06 Thread David Tardon 
 svtools/source/graphic/graphic.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 47c85a818ecd956d26fa7790ca9c0e7835c5c0b0
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Dec 17 13:29:50 2011 +0100

gcc-trunk: avoid confusion

Signed-off-by: David Tardon dtar...@redhat.com

diff --git a/svtools/source/graphic/graphic.hxx 
b/svtools/source/graphic/graphic.hxx
index 7b4f5e0..a1efca0 100644
--- a/svtools/source/graphic/graphic.hxx
+++ b/svtools/source/graphic/graphic.hxx
@@ -58,7 +58,7 @@ public:
 Graphic();
 ~Graphic() throw();
 
-using unographic::GraphicDescriptor::init;
+using ::unographic::GraphicDescriptor::init;
 void init( const ::Graphic rGraphic ) throw();
 
 static const ::Graphic* getImplementation( const 
::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface  rxIFace 
) throw();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: xmloff/source

2012-01-06 Thread Cédric Bosdonnat 
 xmloff/source/style/PageMasterExportPropMapper.cxx |   10 ++
 1 file changed, 2 insertions(+), 8 deletions(-)

New commits:
commit 0100280a5c5b121fab2aa932092a7a887bbb507c
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date:   Fri Jan 6 10:33:19 2012 +0100

fdo#43862: reintroduce fo:margin-* on top of fo:margin for backward compat

diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx 
b/xmloff/source/style/PageMasterExportPropMapper.cxx
index ba0f45b..eedb4a4 100644
--- a/xmloff/source/style/PageMasterExportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterExportPropMapper.cxx
@@ -151,14 +151,8 @@ void XMLPropertyStateBuffer::ContextFilter( ::std::vector 
XMLPropertyState  )
 pPMMarginLeft-maValue = nLeft;
 pPMMarginRight-maValue = nRight;
 
-if ((nTop == nBottom)  (nBottom == nLeft)  (nLeft == nRight))
-{
-lcl_RemoveState( pPMMarginTop );
-lcl_RemoveState( pPMMarginBottom );
-lcl_RemoveState( pPMMarginLeft );
-lcl_RemoveState( pPMMarginRight );
-}
-else
+// Don't remove the Margin Left,Right,Top,Bottom for backward 
compatibility
+if ((nTop != nBottom) || (nBottom != nLeft) || (nLeft != nRight))
 lcl_RemoveState( pPMMarginAll );
 }
 else
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - basic/source cairo/cairo cairo/cairo.dlsym.lcdfilter.patch cppu/source dbaccess/source editeng/source idl/source sc/source sfx2/source svl/source svtools/source sv

2012-01-06 Thread Caolán McNamara 
 basic/source/basmgr/basmgr.cxx  |   15 ++-
 basic/source/classes/image.cxx  |   11 ++---
 basic/source/classes/sbxmod.cxx |4 --
 basic/source/runtime/methods1.cxx   |3 -
 cairo/cairo.dlsym.lcdfilter.patch   |   56 
 cairo/cairo/makefile.mk |4 +-
 cppu/source/typelib/typelib.cxx |2 -
 dbaccess/source/ui/tabledesign/TableRow.cxx |9 ++--
 editeng/source/editeng/editobj.cxx  |6 +--
 editeng/source/items/bulitem.cxx|7 +--
 editeng/source/items/flditem.cxx|2 -
 editeng/source/items/frmitems.cxx   |5 +-
 editeng/source/items/textitem.cxx   |8 ++--
 idl/source/objects/module.cxx   |2 -
 sc/source/core/data/patattr.cxx |2 -
 sc/source/core/tool/autoform.cxx|4 +-
 sc/source/core/tool/ddelink.cxx |6 +--
 sc/source/core/tool/zforauto.cxx|2 -
 sfx2/source/appl/appmisc.cxx|5 +-
 svl/source/items/poolitem.cxx   |5 +-
 svl/source/numbers/zformat.cxx  |2 -
 svtools/source/misc/templatefoldercache.cxx |6 +--
 svtools/source/misc/transfer.cxx|4 +-
 svx/source/items/hlnkitem.cxx   |   16 
 svx/source/items/pageitem.cxx   |3 -
 sw/source/core/doc/tblafmt.cxx  |8 ++--
 sw/source/ui/config/uinums.cxx  |   14 +++
 tools/inc/tools/stream.hxx  |2 -
 tools/source/stream/stream.cxx  |   21 +-
 vcl/source/gdi/font.cxx |4 +-
 vcl/source/gdi/metaact.cxx  |8 ++--
 31 files changed, 143 insertions(+), 103 deletions(-)

New commits:
commit 79f5f4c97188e8584aceb6af98473c06f40f7500
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jan 6 09:37:16 2012 +

Resolves: fdo#44219 RHEL-4 buildbox doesn't have FT_Library_SetLcdFilter

diff --git a/cairo/cairo.dlsym.lcdfilter.patch 
b/cairo/cairo.dlsym.lcdfilter.patch
new file mode 100644
index 000..46f7ac7
--- /dev/null
+++ b/cairo/cairo.dlsym.lcdfilter.patch
@@ -0,0 +1,56 @@
+--- misc/cairo-1.10.2/src/cairo-ft-font.c  2012-01-06 09:09:21.500373823 
+
 misc/build/cairo-1.10.2/src/cairo-ft-font.c2012-01-06 
09:31:01.645238786 +
+@@ -59,6 +59,8 @@
+ 
+ #if HAVE_FT_LIBRARY_SETLCDFILTER
+ #include FT_LCD_FILTER_H
++#elif HAVE_DLFCN_H
++#include dlfcn.h
+ #endif
+ 
+ /* Fontconfig version older than 2.6 didn't have these options */
+@@ -1217,6 +1219,26 @@
+ return CAIRO_STATUS_SUCCESS;
+ }
+ 
++static void try_FT_Library_SetLcdFilter( FT_Library library,
++int lcd_filter )
++{
++#if HAVE_FT_LIBRARY_SETLCDFILTER
++FT_Library_SetLcdFilter (library, lcd_filter);
++#elif HAVE_DLFCN_H
++static void (*pFT_Library_SetLcdFilter) (FT_Library, int);
++static int dlsymed = 0;
++
++if (!dlsymed)
++{
++pFT_Library_SetLcdFilter = dlsym(RTLD_DEFAULT, 
FT_Library_SetLcdFilter);
++dlsymed = 1;
++}
++
++if (pFT_Library_SetLcdFilter)
++  (*pFT_Library_SetLcdFilter) (library, lcd_filter); 
++#endif
++}
++
+ /* Converts an outline FT_GlyphSlot into an image
+  *
+  * This could go through _render_glyph_bitmap as well, letting
+@@ -1350,15 +1372,11 @@
+   break;
+   }
+ 
+-#if HAVE_FT_LIBRARY_SETLCDFILTER
+-  FT_Library_SetLcdFilter (library, lcd_filter);
+-#endif
++  try_FT_Library_SetLcdFilter(library, lcd_filter);
+ 
+   fterror = FT_Render_Glyph (face-glyph, render_mode);
+ 
+-#if HAVE_FT_LIBRARY_SETLCDFILTER
+-  FT_Library_SetLcdFilter (library, FT_LCD_FILTER_NONE);
+-#endif
++  try_FT_Library_SetLcdFilter(library, FT_LCD_FILTER_NONE);
+ 
+   if (fterror != 0)
+   return _cairo_error (CAIRO_STATUS_NO_MEMORY);
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index 7f84e3d..1c06c74 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -47,7 +47,9 @@ CAIROVERSION=1.10.2
 TARFILE_NAME=$(PRJNAME)-$(CAIROVERSION)
 TARFILE_MD5=f101a9e88b783337b20b2e26dfd26d5f
 
-PATCH_FILES=..$/$(TARFILE_NAME).patch
+PATCH_FILES=\
+..$/cairo-1.10.2.patch \
+..$/cairo.dlsym.lcdfilter.patch
 
 .IF $(OS)$(COM) == WNTMSC
 PATCH_FILES+= ..$/$(TARFILE_NAME).wntmsc.patch
commit 504e01e52e38583c6bcbd620973b314596633cdb
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jan 6 08:59:45 2012 +

typo in OSL_DEBUG_LEVEL  1 code

diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index a0ed525..169d29d 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -737,7 +737,7 @@ extern C void SAL_CALL typelib_typedescription_newEmpty(
 pRet = (typelib_TypeDescription *)pTmp;
 #if OSL_DEBUG_LEVEL  1
 osl_incrementInterlockedCount(
-

[Libreoffice-commits] .: fpicker/source

2012-01-06 Thread Lubos Lunak 
 fpicker/source/unx/kde4/KDE4FilePicker.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit 0d7e2108425da1f81c20a605145679168486df59
Author: Luboš Luňák l.lu...@suse.cz
Date:   Fri Jan 6 10:55:03 2012 +0100

workaround for LO namespace pollution breaking KDE4 fpicker build

diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx 
b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
index f282645..69be3b1 100644
--- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx
+++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
@@ -56,7 +56,10 @@
 #define Region QtXRegion
 
 //kde has an enum that uses this...OO does too
+#define LO_SETTINGS_MOUSE SETTINGS_MOUSE
 #undef SETTINGS_MOUSE
+#define LO_SETTINGS_LOCALE SETTINGS_LOCALE
+#undef SETTINGS_LOCALE
 
 #include kfiledialog.h
 #include kwindowsystem.h
@@ -70,6 +73,11 @@
 
 #undef Region
 
+#define SETTINGS_MOUSE LO_SETTINGS_MOUSE
+#undef LO_SETTINGS_MOUSE
+#define SETTINGS_LOCALE LO_SETTINGS_LOCALE
+#undef LO_SETTINGS_LOCALE
+
 using namespace ::com::sun::star;
 
 using namespace ::com::sun::star::ui::dialogs;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - fpicker/source

2012-01-06 Thread Lubos Lunak 
 fpicker/source/unx/kde4/KDE4FilePicker.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit 0c1cf6119556969f7875dc587905070e3f1b6f60
Author: Luboš Luňák l.lu...@suse.cz
Date:   Fri Jan 6 10:55:03 2012 +0100

workaround for LO namespace pollution breaking KDE4 fpicker build

diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx 
b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
index f282645..69be3b1 100644
--- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx
+++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
@@ -56,7 +56,10 @@
 #define Region QtXRegion
 
 //kde has an enum that uses this...OO does too
+#define LO_SETTINGS_MOUSE SETTINGS_MOUSE
 #undef SETTINGS_MOUSE
+#define LO_SETTINGS_LOCALE SETTINGS_LOCALE
+#undef SETTINGS_LOCALE
 
 #include kfiledialog.h
 #include kwindowsystem.h
@@ -70,6 +73,11 @@
 
 #undef Region
 
+#define SETTINGS_MOUSE LO_SETTINGS_MOUSE
+#undef LO_SETTINGS_MOUSE
+#define SETTINGS_LOCALE LO_SETTINGS_LOCALE
+#undef LO_SETTINGS_LOCALE
+
 using namespace ::com::sun::star;
 
 using namespace ::com::sun::star::ui::dialogs;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: connectivity/source

2012-01-06 Thread Caolán McNamara 
 connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit 6be6357cce999e5a1a692da1f682847be3723587
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jan 6 10:24:30 2012 +

generic unix .mozilla dir is under home dir, not xdg-config-dir

diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx 
b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
index 3625e56..4db639b 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
@@ -56,7 +56,15 @@ namespace
 ::osl::Security   aSecurity;
 ::rtl::OUString   aConfigPath;
 
+#if defined(XP_WIN) || defined(MACOSX)
 aSecurity.getConfigDir( aConfigPath );
+#else
+//This is to find the dir under which .mozilla/.thunderbird is created.
+//mozilla doesn't honour XDG_CONFIG_HOME, so raw home dir required here
+//not xdg-config dir
+aSecurity.getHomeDir( aConfigPath );
+#endif
+
 return aConfigPath + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(/));
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basegfx/CppunitTest_basegfx.mk basegfx/Executable_basegfx_cppunittester_all.mk basegfx/test unusedcode.easy

2012-01-06 Thread Matus Kukan 
 basegfx/CppunitTest_basegfx.mk  |6 
 basegfx/Executable_basegfx_cppunittester_all.mk |1 
 basegfx/test/testtools.cxx  |  235 
 basegfx/test/testtools.hxx  |  101 --
 unusedcode.easy |4 
 5 files changed, 347 deletions(-)

New commits:
commit ef41022c112924b339b8c9a426b161d81aa8a947
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Fri Jan 6 11:28:01 2012 +0100

unusedcode: remove Plotter

diff --git a/basegfx/CppunitTest_basegfx.mk b/basegfx/CppunitTest_basegfx.mk
index 2c3da08..3acabef 100644
--- a/basegfx/CppunitTest_basegfx.mk
+++ b/basegfx/CppunitTest_basegfx.mk
@@ -36,7 +36,6 @@ $(eval $(call 
gb_CppunitTest_add_exception_objects,basegfx_test, \
basegfx/test/basegfxtools \
basegfx/test/clipstate \
basegfx/test/genericclipper \
-   basegfx/test/testtools \
 ))
 
 $(eval $(call gb_CppunitTest_add_linked_libs,basegfx_test, \
@@ -47,11 +46,6 @@ $(eval $(call gb_CppunitTest_add_linked_libs,basegfx_test, \
 $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,basegfx_test,\
-   $$(INCLUDE) \
-   -I$(OUTDIR)/inc/offuh \
-))
-
 $(eval $(call gb_CppunitTest_add_api,basegfx_test,\
 offapi \
 udkapi \
diff --git a/basegfx/Executable_basegfx_cppunittester_all.mk 
b/basegfx/Executable_basegfx_cppunittester_all.mk
index 0a6e80b..3c09e85 100644
--- a/basegfx/Executable_basegfx_cppunittester_all.mk
+++ b/basegfx/Executable_basegfx_cppunittester_all.mk
@@ -61,7 +61,6 @@ $(eval $(call 
gb_Executable_add_exception_objects,basegfx_cppunittester_all, \
basegfx/test/basegfxtools \
basegfx/test/clipstate \
basegfx/test/genericclipper \
-   basegfx/test/testtools \
 ))
 
 $(eval $(call gb_Executable_add_api,basegfx_cppunittester_all, \
diff --git a/basegfx/test/testtools.cxx b/basegfx/test/testtools.cxx
deleted file mode 100644
index f467c2d..000
--- a/basegfx/test/testtools.cxx
+++ /dev/null
@@ -1,235 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-
-#include testtools.hxx
-
-#include basegfx/point/b2dpoint.hxx
-#include basegfx/vector/b2dvector.hxx
-#include basegfx/range/b2drange.hxx
-#include basegfx/curve/b2dcubicbezier.hxx
-#include basegfx/polygon/b2dpolygon.hxx
-#include basegfx/polygon/b2dpolypolygon.hxx
-
-#include algorithm
-
-
-namespace basegfx
-{
-namespace testtools
-{
-Plotter::Plotter( ::std::ostream rOutputStream ) :
-mrOutputStream(rOutputStream),
-maPoints(),
-mbFirstElement( true )
-{
-// output gnuplot setup. We switch gnuplot to parametric
-// mode, therefore every plot has at least _two_
-// functions: one for the x and one for the y value, both
-// depending on t.
-mrOutputStream  #!/usr/bin/gnuplot -persist  ::std::endl
-#  ::std::endl
-# automatically generated by 
basegfx::testtools::Plotter, don't change!  ::std::endl
-#  ::std::endl
-set parametric  ::std::endl
-// This function plots a cubic bezier curve. P,q,r,s
-// are the control point elements of the corresponding
-// output coordinate component (i.e. x components for
-// the x plot, and y components for the y plot)
-cubicBezier(p,q,r,s,t) = 
p*(1-t)**3+q*3*(1-t)**2*t+r*3*(1-t)*t**2+s*t**3  ::std::endl
-
-// This function plots the derivative of a cubic
-// bezier curve. P,q,r,s are the control point
-// components of the _original_ curve
-

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - cairo/cairo cairo/cairo.dlsym.lcdfilter.patch

2012-01-06 Thread Jan Holesovsky 
 cairo/cairo.dlsym.lcdfilter.patch |   56 ++
 cairo/cairo/makefile.mk   |4 ++
 2 files changed, 59 insertions(+), 1 deletion(-)

New commits:
commit d58120ef8b3012087c92406fc1dd4858df3807d0
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jan 6 09:37:16 2012 +

Resolves: fdo#44219 RHEL-4 buildbox doesn't have FT_Library_SetLcdFilter

diff --git a/cairo/cairo.dlsym.lcdfilter.patch 
b/cairo/cairo.dlsym.lcdfilter.patch
new file mode 100644
index 000..46f7ac7
--- /dev/null
+++ b/cairo/cairo.dlsym.lcdfilter.patch
@@ -0,0 +1,56 @@
+--- misc/cairo-1.10.2/src/cairo-ft-font.c  2012-01-06 09:09:21.500373823 
+
 misc/build/cairo-1.10.2/src/cairo-ft-font.c2012-01-06 
09:31:01.645238786 +
+@@ -59,6 +59,8 @@
+ 
+ #if HAVE_FT_LIBRARY_SETLCDFILTER
+ #include FT_LCD_FILTER_H
++#elif HAVE_DLFCN_H
++#include dlfcn.h
+ #endif
+ 
+ /* Fontconfig version older than 2.6 didn't have these options */
+@@ -1217,6 +1219,26 @@
+ return CAIRO_STATUS_SUCCESS;
+ }
+ 
++static void try_FT_Library_SetLcdFilter( FT_Library library,
++int lcd_filter )
++{
++#if HAVE_FT_LIBRARY_SETLCDFILTER
++FT_Library_SetLcdFilter (library, lcd_filter);
++#elif HAVE_DLFCN_H
++static void (*pFT_Library_SetLcdFilter) (FT_Library, int);
++static int dlsymed = 0;
++
++if (!dlsymed)
++{
++pFT_Library_SetLcdFilter = dlsym(RTLD_DEFAULT, 
FT_Library_SetLcdFilter);
++dlsymed = 1;
++}
++
++if (pFT_Library_SetLcdFilter)
++  (*pFT_Library_SetLcdFilter) (library, lcd_filter); 
++#endif
++}
++
+ /* Converts an outline FT_GlyphSlot into an image
+  *
+  * This could go through _render_glyph_bitmap as well, letting
+@@ -1350,15 +1372,11 @@
+   break;
+   }
+ 
+-#if HAVE_FT_LIBRARY_SETLCDFILTER
+-  FT_Library_SetLcdFilter (library, lcd_filter);
+-#endif
++  try_FT_Library_SetLcdFilter(library, lcd_filter);
+ 
+   fterror = FT_Render_Glyph (face-glyph, render_mode);
+ 
+-#if HAVE_FT_LIBRARY_SETLCDFILTER
+-  FT_Library_SetLcdFilter (library, FT_LCD_FILTER_NONE);
+-#endif
++  try_FT_Library_SetLcdFilter(library, FT_LCD_FILTER_NONE);
+ 
+   if (fterror != 0)
+   return _cairo_error (CAIRO_STATUS_NO_MEMORY);
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index fc0111c..3abc352 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -47,7 +47,9 @@ CAIROVERSION=1.10.2
 TARFILE_NAME=$(PRJNAME)-$(CAIROVERSION)
 TARFILE_MD5=f101a9e88b783337b20b2e26dfd26d5f
 
-PATCH_FILES=..$/$(TARFILE_NAME).patch
+PATCH_FILES=\
+..$/cairo-1.10.2.patch \
+..$/cairo.dlsym.lcdfilter.patch
 
 .IF $(OS)$(COM) == WNTMSC
 PATCH_FILES+= ..$/$(TARFILE_NAME).wntmsc.patch
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: starmath/source

2012-01-06 Thread Lubos Lunak 
 starmath/source/ooxmlexport.cxx |2 +-
 starmath/source/ooxmlimport.cxx |5 -
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 6977d658e16d7c2042eb4ac7db20a1aaf7b3beab
Author: Luboš Luňák l.lu...@suse.cz
Date:   Fri Jan 6 12:20:54 2012 +0100

write TBAR rather as an accent, use over/underline for m:bar

seems to match the docx semantics better, despite the names

diff --git a/starmath/source/ooxmlexport.cxx b/starmath/source/ooxmlexport.cxx
index a7740da..fd12301 100644
--- a/starmath/source/ooxmlexport.cxx
+++ b/starmath/source/ooxmlexport.cxx
@@ -324,6 +324,7 @@ void SmOoxmlExport::HandleAttribute( const SmAttributNode* 
pNode, int nLevel )
 case TWIDETILDE:
 case TWIDEHAT:
 case TWIDEVEC:
+case TBAR:
 {
 m_pSerializer-startElementNS( XML_m, XML_acc, FSEND );
 m_pSerializer-startElementNS( XML_m, XML_accPr, FSEND );
@@ -337,7 +338,6 @@ void SmOoxmlExport::HandleAttribute( const SmAttributNode* 
pNode, int nLevel )
 m_pSerializer-endElementNS( XML_m, XML_acc );
 break;
 }
-case TBAR:
 case TOVERLINE:
 case TUNDERLINE:
 m_pSerializer-startElementNS( XML_m, XML_bar, FSEND );
diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx
index 2fa59e1..6d40375 100644
--- a/starmath/source/ooxmlimport.cxx
+++ b/starmath/source/ooxmlimport.cxx
@@ -191,6 +191,9 @@ OUString SmOoxmlImport::handleAcc()
 OUString acc;
 switch( accChr )
 {
+case MS_BAR:
+acc = STR( bar );
+break;
 case MS_CHECK:
 acc = STR( check );
 break;
@@ -256,7 +259,7 @@ OUString SmOoxmlImport::handleBar()
 OUString e = readOMathArgInElement( M_TOKEN( e ));
 stream.ensureClosingTag( M_TOKEN( bar ));
 if( topbot == top )
-return STR( bar { ) + e + STR( } );
+return STR( overline { ) + e + STR( } );
 else
 return STR( underline { ) + e + STR( } );
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - starmath/source

2012-01-06 Thread Lubos Lunak 
 starmath/source/ooxmlexport.cxx |2 +-
 starmath/source/ooxmlimport.cxx |5 -
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit cedaffbc1323f7ae3dd0ba9426385e205ff513a7
Author: Luboš Luňák l.lu...@suse.cz
Date:   Fri Jan 6 12:20:54 2012 +0100

write TBAR rather as an accent, use over/underline for m:bar

seems to match the docx semantics better, despite the names

diff --git a/starmath/source/ooxmlexport.cxx b/starmath/source/ooxmlexport.cxx
index a7740da..fd12301 100644
--- a/starmath/source/ooxmlexport.cxx
+++ b/starmath/source/ooxmlexport.cxx
@@ -324,6 +324,7 @@ void SmOoxmlExport::HandleAttribute( const SmAttributNode* 
pNode, int nLevel )
 case TWIDETILDE:
 case TWIDEHAT:
 case TWIDEVEC:
+case TBAR:
 {
 m_pSerializer-startElementNS( XML_m, XML_acc, FSEND );
 m_pSerializer-startElementNS( XML_m, XML_accPr, FSEND );
@@ -337,7 +338,6 @@ void SmOoxmlExport::HandleAttribute( const SmAttributNode* 
pNode, int nLevel )
 m_pSerializer-endElementNS( XML_m, XML_acc );
 break;
 }
-case TBAR:
 case TOVERLINE:
 case TUNDERLINE:
 m_pSerializer-startElementNS( XML_m, XML_bar, FSEND );
diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx
index 1cdee7f..34c6831 100644
--- a/starmath/source/ooxmlimport.cxx
+++ b/starmath/source/ooxmlimport.cxx
@@ -191,6 +191,9 @@ OUString SmOoxmlImport::handleAcc()
 OUString acc;
 switch( accChr )
 {
+case MS_BAR:
+acc = STR( bar );
+break;
 case MS_CHECK:
 acc = STR( check );
 break;
@@ -256,7 +259,7 @@ OUString SmOoxmlImport::handleBar()
 OUString e = readOMathArgInElement( M_TOKEN( e ));
 stream.ensureClosingTag( M_TOKEN( bar ));
 if( topbot == top )
-return STR( bar { ) + e + STR( } );
+return STR( overline { ) + e + STR( } );
 else
 return STR( underline { ) + e + STR( } );
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: starmath/source

2012-01-06 Thread Lubos Lunak 
 starmath/source/node.cxx |   24 
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 608c927c0faac0b1e143cf50ce88003a2aaea73f
Author: Luboš Luňák l.lu...@suse.cz
Date:   Fri Jan 6 12:45:00 2012 +0100

symbolic names instead of hex values for math symbols where possible

diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index d5866cd..09d2ee8 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -2824,46 +2824,46 @@ void SmAttributNode::CreateTextFromNode(String rText)
 case 0xAF: // MACRON
 APPEND(rText,overline );
 break;
-case 0x2d9: // DOT ABOVE
+case MS_DOT: // DOT ABOVE
 APPEND(rText,dot );
 break;
 case 0x2dc: // SMALL TILDE
 APPEND(rText,widetilde );
 break;
-case 0xA8: // DIAERESIS
+case MS_DDOT: // DIAERESIS
 APPEND(rText,ddot );
 break;
 case 0xE082:
 break;
 case 0xE09B:
-case 0x20DB: // COMBINING THREE DOTS ABOVE
+case MS_DDDOT: // COMBINING THREE DOTS ABOVE
 APPEND(rText,dddot );
 break;
-case 0x301: // COMBINING ACUTE ACCENT
+case MS_ACUTE: // COMBINING ACUTE ACCENT
 APPEND(rText,acute );
 break;
-case 0x300: // COMBINING GRAVE ACCENT
+case MS_GRAVE: // COMBINING GRAVE ACCENT
 APPEND(rText,grave );
 break;
-case 0x30C: // COMBINING CARON
+case MS_CHECK: // COMBINING CARON
 APPEND(rText,check );
 break;
-case 0x306: // COMBINING BREVE
+case MS_BREVE: // COMBINING BREVE
 APPEND(rText,breve );
 break;
-case 0x30A: // COMBINING RING ABOVE
+case MS_CIRCLE: // COMBINING RING ABOVE
 APPEND(rText,circle );
 break;
-case 0x20D7: // COMBINING RIGHT ARROW ABOVE
+case MS_VEC: // COMBINING RIGHT ARROW ABOVE
 APPEND(rText,vec );
 break;
-case 0x303: // COMBINING TILDE
+case MS_TILDE: // COMBINING TILDE
 APPEND(rText,tilde );
 break;
-case 0x302: // COMBINING CIRCUMFLEX ACCENT
+case MS_HAT: // COMBINING CIRCUMFLEX ACCENT
 APPEND(rText,hat );
 break;
-case 0x304: // COMBINING MACRON
+case MS_BAR: // COMBINING MACRON
 APPEND(rText,bar );
 break;
 default:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - starmath/source

2012-01-06 Thread Lubos Lunak 
 starmath/source/node.cxx |   36 
 1 file changed, 32 insertions(+), 4 deletions(-)

New commits:
commit c3e17714831bf80270a29a5e09194c8f141e42f3
Author: Joshua Cogliati jjcogliati...@yahoo.com
Date:   Fri Jan 6 10:48:01 2012 +

smath does not handle accents in MathML

diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 58010e7..d5866cd 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -2821,23 +2821,51 @@ void SmAttributNode::CreateTextFromNode(String rText)
 nLast = aStr.GetChar(0);
 switch (nLast)
 {
-case 0xAF:
+case 0xAF: // MACRON
 APPEND(rText,overline );
 break;
-case 0x2d9:
+case 0x2d9: // DOT ABOVE
 APPEND(rText,dot );
 break;
-case 0x2dc:
+case 0x2dc: // SMALL TILDE
 APPEND(rText,widetilde );
 break;
-case 0xA8:
+case 0xA8: // DIAERESIS
 APPEND(rText,ddot );
 break;
 case 0xE082:
 break;
 case 0xE09B:
+case 0x20DB: // COMBINING THREE DOTS ABOVE
 APPEND(rText,dddot );
 break;
+case 0x301: // COMBINING ACUTE ACCENT
+APPEND(rText,acute );
+break;
+case 0x300: // COMBINING GRAVE ACCENT
+APPEND(rText,grave );
+break;
+case 0x30C: // COMBINING CARON
+APPEND(rText,check );
+break;
+case 0x306: // COMBINING BREVE
+APPEND(rText,breve );
+break;
+case 0x30A: // COMBINING RING ABOVE
+APPEND(rText,circle );
+break;
+case 0x20D7: // COMBINING RIGHT ARROW ABOVE
+APPEND(rText,vec );
+break;
+case 0x303: // COMBINING TILDE
+APPEND(rText,tilde );
+break;
+case 0x302: // COMBINING CIRCUMFLEX ACCENT
+APPEND(rText,hat );
+break;
+case 0x304: // COMBINING MACRON
+APPEND(rText,bar );
+break;
 default:
 rText.Append(nLast);
 break;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sal/osl

2012-01-06 Thread Caolán McNamara 
 sal/osl/unx/file.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit c11bcb5be5a282864ffc35d2b29d530f07a7e8fd
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jan 6 12:10:45 2012 +

valgrind: error on startup in osl_unmapMappedFile

diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index bb31902..4bb30cf 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -1045,13 +1045,16 @@ SAL_CALL osl_closeFile( oslFileHandle Handle )
 {
 FileHandle_Impl* pImpl = static_castFileHandle_Impl*(Handle);
 
+if (pImpl == 0)
+return osl_File_E_INVAL;
+
 if (pImpl-m_kind == FileHandle_Impl::KIND_MEM)
 {
 delete pImpl;
 return osl_File_E_None;
 }
 
-if ((pImpl == 0) || (pImpl-m_fd  0))
+if (pImpl-m_fd  0)
 return osl_File_E_INVAL;
 
 (void) pthread_mutex_lock ((pImpl-m_mutex));
@@ -1239,6 +1242,9 @@ SAL_CALL osl_unmapMappedFile (oslFileHandle Handle, void* 
pAddr, sal_uInt64 uLen
 {
 FileHandle_Impl * pImpl = static_castFileHandle_Impl*(Handle);
 
+if (pImpl == 0)
+return osl_File_E_INVAL;
+
 if (pImpl-m_kind == FileHandle_Impl::KIND_FD)
 return unmapFile (pAddr, uLength);
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild

2012-01-06 Thread Andras Timar 
 solenv/gbuild/Extension.mk |   21 ++---
 1 file changed, 18 insertions(+), 3 deletions(-)

New commits:
commit 7cebed268a11ae9193cd0d7323e32cd138c7ef9d
Author: Andras Timar ati...@suse.com
Date:   Fri Jan 6 14:51:07 2012 +0100

gbuild: fix extension localization on Windows

diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 7f004f6..0f1e092 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -36,13 +36,13 @@ endif
 gb_Extension_XRMEXTARGET := $(call gb_Executable_get_target,xrmex)
 gb_Extension_XRMEXCOMMAND := \
$(gb_Helper_set_ld_path) $(gb_Extension_XRMEXTARGET)
-gb_Extension_PROPMERGETARGET := $(call gb_Executable_get_target,propmerge)
+gb_Extension_PROPMERGETARGET := $(OUTDIR)/bin/propmerge
 gb_Extension_PROPMERGECOMMAND := \
$(PERL) $(gb_Extension_PROPMERGETARGET)
 gb_Extension_HELPEXTARGET := $(call gb_Executable_get_target,helpex)
 gb_Extension_HELPEXCOMMAND := \
$(gb_Helper_set_ld_path) $(gb_Extension_HELPEXTARGET)
-gb_Extension_SDFLOCATION := $(SRCDIR)/translations/$(INPATH)/misc/sdf/
+gb_Extension_SDFLOCATION := $(L10N_MODULE)/$(INPATH)/misc/sdf/
 # does not contain en-US because it is special cased in gb_Extension_Extension
 gb_Extension_LANGS := $(filter-out en-US,$(gb_WITH_LANG))
 
@@ -64,6 +64,16 @@ else
 $(call gb_Extension_get_workdir,%)/description.xml : | \
$(gb_Extension_XRMEXTARGET)
$(call gb_Output_announce,$*/description.xml,$(true),XRM,3)
+ifeq ($(OS_FOR_BUILD),WNT)
+   $(call gb_Helper_abbreviate_dirs_native,\
+   mkdir -p $(call gb_Extension_get_workdir,$*)  \
+   $(gb_Extension_XRMEXCOMMAND) \
+   -p $(PRJNAME) \
+   -i $(shell cygpath -m $(filter %.xml,$^)) \
+   -o $(shell cygpath -m $@) \
+   -m $(SDF) \
+   -l all)
+else
$(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(call gb_Extension_get_workdir,$*)  \
$(gb_Extension_XRMEXCOMMAND) \
@@ -73,6 +83,7 @@ $(call gb_Extension_get_workdir,%)/description.xml : | \
-m $(SDF) \
-l all)
 endif
+endif
 
 # rule to create oxt package in workdir
 # --filesync makes sure that all files in the oxt package will be removed that 
no longer are in $(FILES)
@@ -148,7 +159,7 @@ endef
 define gb_Extension_localize_help
 ifneq ($(strip $(gb_WITH_LANG)),)
 $(call gb_Extension_get_target,$(1)) : FILES += $(foreach 
lang,$(gb_Extension_LANGS),$(subst lang,$(lang),$(2)))
-$(call gb_Extension_get_target,$(1)) : SDF3 := $(realpath 
$(gb_Extension_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf)
+$(call gb_Extension_get_target,$(1)) : SDF3 := 
$(gb_Extension_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf
 $(call gb_Extension_get_target,$(1)) : $$(SDF3)
 $(foreach lang,$(gb_Extension_LANGS),$(call 
gb_Extension_localize_help_onelang,$(1),$(subst 
lang,$(lang),$(2)),$(3),$(lang)))
 endif
@@ -160,7 +171,11 @@ $(call gb_Extension_get_target,$(1)) : $(call 
gb_Extension_get_workdir,$(1))/$(2
 $(call gb_Extension_get_workdir,$(1))/$(2) : $(3)
$(call gb_Output_announce,$(2),$(true),XHP,3)
mkdir -p $$(dir $$@)
+ifeq ($(OS_FOR_BUILD),WNT)
+   $(gb_Extension_HELPEXCOMMAND) -i $$(shell cygpath -m $$) -o $$(shell 
cygpath -m $$@) -l $(4) -m $$(SDF3)
+else
$(gb_Extension_HELPEXCOMMAND) -i $$ -o $$@ -l $(4) -m $$(SDF3)
+endif
 
 endef
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - solenv/gbuild

2012-01-06 Thread Andras Timar 
 solenv/gbuild/Extension.mk |   19 +--
 1 file changed, 17 insertions(+), 2 deletions(-)

New commits:
commit 643a4487772b6d1ca37e13ba5651d45a0a2d3c04
Author: Andras Timar ati...@suse.com
Date:   Fri Jan 6 14:51:07 2012 +0100

gbuild: fix extension localization on Windows

diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 3069408..5ee8a97 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -36,13 +36,13 @@ endif
 gb_Extension_XRMEXTARGET := $(call gb_Executable_get_target,xrmex)
 gb_Extension_XRMEXCOMMAND := \
$(gb_Helper_set_ld_path) $(gb_Extension_XRMEXTARGET)
-gb_Extension_PROPMERGETARGET := $(call gb_Executable_get_target,propmerge)
+gb_Extension_PROPMERGETARGET := $(OUTDIR)/bin/propmerge
 gb_Extension_PROPMERGECOMMAND := \
$(PERL) $(gb_Extension_PROPMERGETARGET)
 gb_Extension_HELPEXTARGET := $(call gb_Executable_get_target,helpex)
 gb_Extension_HELPEXCOMMAND := \
$(gb_Helper_set_ld_path) $(gb_Extension_HELPEXTARGET)
-gb_Extension_SDFLOCATION := $(SRCDIR)/translations/$(INPATH)/misc/sdf/
+gb_Extension_SDFLOCATION := $(L10N_MODULE)/$(INPATH)/misc/sdf/
 # does not contain en-US because it is special cased in gb_Extension_Extension
 gb_Extension_LANGS := $(filter-out en-US,$(gb_WITH_LANG))
 
@@ -64,6 +64,16 @@ else
 $(call gb_Extension_get_workdir,%)/description.xml : | \
$(gb_Extension_XRMEXTARGET)
$(call gb_Output_announce,$*/description.xml,$(true),XRM,3)
+ifeq ($(OS_FOR_BUILD),WNT)
+   $(call gb_Helper_abbreviate_dirs_native,\
+   mkdir -p $(call gb_Extension_get_workdir,$*)  \
+   $(gb_Extension_XRMEXCOMMAND) \
+   -p $(PRJNAME) \
+   -i $(shell cygpath -m $(filter %.xml,$^)) \
+   -o $(shell cygpath -m $@) \
+   -m $(SDF) \
+   -l all)
+else
$(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(call gb_Extension_get_workdir,$*)  \
$(gb_Extension_XRMEXCOMMAND) \
@@ -73,6 +83,7 @@ $(call gb_Extension_get_workdir,%)/description.xml : | \
-m $(SDF) \
-l all)
 endif
+endif
 
 # rule to create oxt package in workdir
 # --filesync makes sure that all files in the oxt package will be removed that 
no longer are in $(FILES)
@@ -148,7 +159,7 @@ endef
 define gb_Extension_localize_help
 ifneq ($(strip $(gb_WITH_LANG)),)
 $(call gb_Extension_get_target,$(1)) : FILES += $(foreach 
lang,$(gb_Extension_LANGS),$(subst lang,$(lang),$(2)))
-$(call gb_Extension_get_target,$(1)) : SDF3 := $(realpath 
$(gb_Extension_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf)
+$(call gb_Extension_get_target,$(1)) : SDF3 := 
$(gb_Extension_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf
 $(call gb_Extension_get_target,$(1)) : $$(SDF3)
 $(foreach lang,$(gb_Extension_LANGS),$(call 
gb_Extension_localize_help_onelang,$(1),$(subst 
lang,$(lang),$(2)),$(3),$(lang)))
 endif
@@ -160,7 +171,11 @@ $(call gb_Extension_get_target,$(1)) : $(call 
gb_Extension_get_workdir,$(1))/$(2
 $(call gb_Extension_get_workdir,$(1))/$(2) : $(3)
$(call gb_Output_announce,$(2),$(true),XHP,3)
mkdir -p $$(dir $$@)
+ifeq ($(OS_FOR_BUILD),WNT)
+   $(gb_Extension_HELPEXCOMMAND) -i $$(shell cygpath -m $$) -o $$(shell 
cygpath -m $$@) -l $(4) -m $$(SDF3)
+else
$(gb_Extension_HELPEXCOMMAND) -i $$ -o $$@ -l $(4) -m $$(SDF3)
+endif
 
 endef
 
commit 76f05b89ecc35fa4c3048a684d787b3052e8efc1
Author: Andras Timar ati...@suse.com
Date:   Fri Jan 6 15:03:14 2012 +0100

Revert propmerge is not executable

This reverts commit 3082565d6291176ef1fcdc053f9851c82a02d19a.

diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 76fdccf..3069408 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -36,7 +36,7 @@ endif
 gb_Extension_XRMEXTARGET := $(call gb_Executable_get_target,xrmex)
 gb_Extension_XRMEXCOMMAND := \
$(gb_Helper_set_ld_path) $(gb_Extension_XRMEXTARGET)
-gb_Extension_PROPMERGETARGET := $(OUTDIR)/bin/propmerge
+gb_Extension_PROPMERGETARGET := $(call gb_Executable_get_target,propmerge)
 gb_Extension_PROPMERGECOMMAND := \
$(PERL) $(gb_Extension_PROPMERGETARGET)
 gb_Extension_HELPEXTARGET := $(call gb_Executable_get_target,helpex)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'feature/gbuild_help'

2012-01-06 Thread David Tardon 
New branch 'feature/gbuild_help' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sd/source

2012-01-06 Thread Ivan Timofeev 
 sd/source/ui/dlg/present.src |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e2b57677d3fcb184606b4efb02c79b3e4847c1a0
Author: Ivan Timofeev timofeev@gmail.com
Date:   Fri Jan 6 17:08:54 2012 +0400

fdo#44294: overlapped controls

diff --git a/sd/source/ui/dlg/present.src b/sd/source/ui/dlg/present.src
index b53facb..6ee3fd8 100644
--- a/sd/source/ui/dlg/present.src
+++ b/sd/source/ui/dlg/present.src
@@ -86,8 +86,8 @@ ModalDialog DLG_START_PRESENTATION
 {
 HelpID = sd:ListBox:DLG_START_PRESENTATION:LB_DIAS;
 Border = TRUE ;
-Pos = MAP_APPFONT ( 82, 24 ) ;
-Size = MAP_APPFONT ( 111, 80 ) ;
+Pos = MAP_APPFONT ( 96, 24 ) ;
+Size = MAP_APPFONT ( 97, 80 ) ;
 TabStop = TRUE ;
 DropDown = TRUE ;
  //DDExtraWidth = TRUE;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sd/source

2012-01-06 Thread Ivan Timofeev 
 sd/source/ui/dlg/present.src |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 58174c2a1e9291cf8cef63dcd51fd6357233c797
Author: Ivan Timofeev timofeev@gmail.com
Date:   Fri Jan 6 17:08:54 2012 +0400

fdo#44294: overlapped controls

diff --git a/sd/source/ui/dlg/present.src b/sd/source/ui/dlg/present.src
index b53facb..6ee3fd8 100644
--- a/sd/source/ui/dlg/present.src
+++ b/sd/source/ui/dlg/present.src
@@ -86,8 +86,8 @@ ModalDialog DLG_START_PRESENTATION
 {
 HelpID = sd:ListBox:DLG_START_PRESENTATION:LB_DIAS;
 Border = TRUE ;
-Pos = MAP_APPFONT ( 82, 24 ) ;
-Size = MAP_APPFONT ( 111, 80 ) ;
+Pos = MAP_APPFONT ( 96, 24 ) ;
+Size = MAP_APPFONT ( 97, 80 ) ;
 TabStop = TRUE ;
 DropDown = TRUE ;
  //DDExtraWidth = TRUE;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: l10ntools/source

2012-01-06 Thread Andras Timar 
 l10ntools/source/helpmerge.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 82558fc4ea28427857ea82232e8edc5c8d6daa6d
Author: Andras Timar ati...@suse.com
Date:   Fri Jan 6 16:32:38 2012 +0100

remove a printf

diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index 47d1ddf..46bee59 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -260,7 +260,6 @@ bool HelpParser::Merge( const ByteString rSDFFile, const 
ByteString rDestinati
 DirEntry aFile( sXmlFile );
 
 XMLFile* xmlfile = ( aParser.Execute( aFile.GetFull() , sOUHelpFile, new 
XMLFile( '0' ) ) );
-printf(Dest file %s\n,rDestinationFile.GetBuffer());
 hasNoError = MergeSingleFile( xmlfile , aMergeDataFile , rLanguage , 
rDestinationFile );
 delete xmlfile;
 if( !sUsedTempFile.EqualsIgnoreCaseAscii(  ) ){
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-01-06 Thread Kohei Yoshida 
 sc/source/ui/inc/datafdlg.hrc  |2 -
 sc/source/ui/inc/datafdlg.hxx  |6 +--
 sc/source/ui/miscdlgs/datafdlg.cxx |   60 +++--
 sc/source/ui/src/datafdlg.src  |4 +-
 4 files changed, 37 insertions(+), 35 deletions(-)

New commits:
commit 81b5a2d152f1e19a5c4f0001e7314a67b531a164
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Fri Jan 6 11:03:05 2012 -0500

The data range may not always start at row 0, use 'n' prefix for int.

diff --git a/sc/source/ui/inc/datafdlg.hxx b/sc/source/ui/inc/datafdlg.hxx
index fbad64e..5600d2c 100644
--- a/sc/source/ui/inc/datafdlg.hxx
+++ b/sc/source/ui/inc/datafdlg.hxx
@@ -67,7 +67,7 @@ private:
 ScTabViewShell* pTabViewShell;
 ScDocument* pDoc;
 sal_uInt16  aColLength;
-SCROW   aCurrentRow;
+SCROW   nCurrentRow;
 SCCOL   nStartCol;
 SCCOL   nEndCol;
 SCROW   nStartRow;
diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx 
b/sc/source/ui/miscdlgs/datafdlg.cxx
index f5926c2..698eb7b 100644
--- a/sc/source/ui/miscdlgs/datafdlg.cxx
+++ b/sc/source/ui/miscdlgs/datafdlg.cxx
@@ -159,7 +159,7 @@ ScDataFormDlg::ScDataFormDlg( Window* pParent, 
ScTabViewShell*  pTabViewShellOri
 nEndRow = nStartRow;
 }
 
-aCurrentRow = nStartRow + 1;
+nCurrentRow = nStartRow + 1;
 
 String  aFieldName;
 
@@ -213,7 +213,7 @@ ScDataFormDlg::ScDataFormDlg( Window* pParent, 
ScTabViewShell*  pTabViewShellOri
 aSlider.SetSizePixel(nScrollSize);
 }
 
-FillCtrls(aCurrentRow);
+FillCtrls(nCurrentRow);
 
 aSlider.SetPageSize( 10 );
 aSlider.SetVisibleSize( 1 );
@@ -246,9 +246,9 @@ void ScDataFormDlg::FillCtrls(SCROW /*nCurrentRow*/)
 {
 if (!maEdits.is_null(i))
 {
-if (aCurrentRow=nEndRow)
+if (nCurrentRow=nEndRow)
 {
-pDoc-GetString( i + nStartCol, aCurrentRow, nTab, aFieldName 
);
+pDoc-GetString( i + nStartCol, nCurrentRow, nTab, aFieldName 
);
 maEdits[i].SetText(aFieldName);
 }
 else
@@ -256,10 +256,10 @@ void ScDataFormDlg::FillCtrls(SCROW /*nCurrentRow*/)
 }
 }
 
-if (aCurrentRow = nEndRow)
+if (nCurrentRow = nEndRow)
 {
 OUStringBuffer aBuf;
-aBuf.append(static_castsal_Int32(aCurrentRow - nStartRow));
+aBuf.append(static_castsal_Int32(nCurrentRow - nStartRow));
 aBuf.appendAscii( / );
 aBuf.append(static_castsal_Int32(nEndRow - nStartRow));
 aFixedText.SetText(aBuf.makeStringAndClear());
@@ -267,7 +267,7 @@ void ScDataFormDlg::FillCtrls(SCROW /*nCurrentRow*/)
 else
 aFixedText.SetText(String(ScResId(STR_NEW_RECORD)));
 
-aSlider.SetThumbPos(aCurrentRow-nStartRow-1);
+aSlider.SetThumbPos(nCurrentRow-nStartRow-1);
 }
 
 IMPL_LINK( ScDataFormDlg, Impl_DataModifyHdl, Edit*, pEdit)
@@ -295,15 +295,15 @@ IMPL_LINK( ScDataFormDlg, Impl_NewHdl, PushButton*, 
EMPTYARG )
 
 if ( bHasData )
 {
-pTabViewShell-DataFormPutData( aCurrentRow , nStartRow , 
nStartCol , nEndRow , nEndCol , maEdits , aColLength );
-aCurrentRow++;
-if (aCurrentRow = nEndRow + 2)
+pTabViewShell-DataFormPutData( nCurrentRow , nStartRow , 
nStartCol , nEndRow , nEndCol , maEdits , aColLength );
+nCurrentRow++;
+if (nCurrentRow = nEndRow + 2)
 {
 nEndRow ++ ;
 aSlider.SetRange( Range( 0, nEndRow - nStartRow + 1) );
 }
 SetButtonState();
-FillCtrls(aCurrentRow);
+FillCtrls(nCurrentRow);
 pDocSh-SetDocumentModified();
 pDocSh-PostPaintGridAll();
 }
@@ -315,11 +315,11 @@ IMPL_LINK( ScDataFormDlg, Impl_PrevHdl, PushButton*, 
EMPTYARG )
 {
 if (pDoc)
 {
-if ( aCurrentRow  nStartRow +1 )
-aCurrentRow--;
+if ( nCurrentRow  nStartRow +1 )
+nCurrentRow--;
 
 SetButtonState();
-FillCtrls(aCurrentRow);
+FillCtrls(nCurrentRow);
 }
 return 0;
 }
@@ -328,11 +328,11 @@ IMPL_LINK( ScDataFormDlg, Impl_NextHdl, PushButton*, 
EMPTYARG )
 {
 if (pDoc)
 {
-if ( aCurrentRow = nEndRow)
-aCurrentRow++;
+if ( nCurrentRow = nEndRow)
+nCurrentRow++;
 
 SetButtonState();
-FillCtrls(aCurrentRow);
+FillCtrls(nCurrentRow);
 }
 return 0;
 }
@@ -341,7 +341,7 @@ IMPL_LINK( ScDataFormDlg, Impl_RestoreHdl, PushButton*, 
EMPTYARG )
 {
 if (pDoc)
 {
-FillCtrls(aCurrentRow);
+FillCtrls(nCurrentRow);
 }
 return 0;
 }
@@ -352,14 +352,14 @@ IMPL_LINK( ScDataFormDlg, Impl_DeleteHdl, PushButton*, 
EMPTYARG )
 ScDocShell* pDocSh = pViewData-GetDocShell();
 if (pDoc)
 {
-ScRange aRange(nStartCol, aCurrentRow, nTab, nEndCol,

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

2012-01-06 Thread Kohei Yoshida 
 sc/source/ui/inc/datafdlg.hrc  |2 -
 sc/source/ui/inc/datafdlg.hxx  |6 +--
 sc/source/ui/miscdlgs/datafdlg.cxx |   60 +++--
 sc/source/ui/src/datafdlg.src  |4 +-
 4 files changed, 37 insertions(+), 35 deletions(-)

New commits:
commit e950930390bfef50a632281048b8e04b5f11ff32
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Fri Jan 6 11:03:05 2012 -0500

The data range may not always start at row 0, use 'n' prefix for int.

diff --git a/sc/source/ui/inc/datafdlg.hxx b/sc/source/ui/inc/datafdlg.hxx
index fbad64e..5600d2c 100644
--- a/sc/source/ui/inc/datafdlg.hxx
+++ b/sc/source/ui/inc/datafdlg.hxx
@@ -67,7 +67,7 @@ private:
 ScTabViewShell* pTabViewShell;
 ScDocument* pDoc;
 sal_uInt16  aColLength;
-SCROW   aCurrentRow;
+SCROW   nCurrentRow;
 SCCOL   nStartCol;
 SCCOL   nEndCol;
 SCROW   nStartRow;
diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx 
b/sc/source/ui/miscdlgs/datafdlg.cxx
index f5926c2..698eb7b 100644
--- a/sc/source/ui/miscdlgs/datafdlg.cxx
+++ b/sc/source/ui/miscdlgs/datafdlg.cxx
@@ -159,7 +159,7 @@ ScDataFormDlg::ScDataFormDlg( Window* pParent, 
ScTabViewShell*  pTabViewShellOri
 nEndRow = nStartRow;
 }
 
-aCurrentRow = nStartRow + 1;
+nCurrentRow = nStartRow + 1;
 
 String  aFieldName;
 
@@ -213,7 +213,7 @@ ScDataFormDlg::ScDataFormDlg( Window* pParent, 
ScTabViewShell*  pTabViewShellOri
 aSlider.SetSizePixel(nScrollSize);
 }
 
-FillCtrls(aCurrentRow);
+FillCtrls(nCurrentRow);
 
 aSlider.SetPageSize( 10 );
 aSlider.SetVisibleSize( 1 );
@@ -246,9 +246,9 @@ void ScDataFormDlg::FillCtrls(SCROW /*nCurrentRow*/)
 {
 if (!maEdits.is_null(i))
 {
-if (aCurrentRow=nEndRow)
+if (nCurrentRow=nEndRow)
 {
-pDoc-GetString( i + nStartCol, aCurrentRow, nTab, aFieldName 
);
+pDoc-GetString( i + nStartCol, nCurrentRow, nTab, aFieldName 
);
 maEdits[i].SetText(aFieldName);
 }
 else
@@ -256,10 +256,10 @@ void ScDataFormDlg::FillCtrls(SCROW /*nCurrentRow*/)
 }
 }
 
-if (aCurrentRow = nEndRow)
+if (nCurrentRow = nEndRow)
 {
 OUStringBuffer aBuf;
-aBuf.append(static_castsal_Int32(aCurrentRow - nStartRow));
+aBuf.append(static_castsal_Int32(nCurrentRow - nStartRow));
 aBuf.appendAscii( / );
 aBuf.append(static_castsal_Int32(nEndRow - nStartRow));
 aFixedText.SetText(aBuf.makeStringAndClear());
@@ -267,7 +267,7 @@ void ScDataFormDlg::FillCtrls(SCROW /*nCurrentRow*/)
 else
 aFixedText.SetText(String(ScResId(STR_NEW_RECORD)));
 
-aSlider.SetThumbPos(aCurrentRow-nStartRow-1);
+aSlider.SetThumbPos(nCurrentRow-nStartRow-1);
 }
 
 IMPL_LINK( ScDataFormDlg, Impl_DataModifyHdl, Edit*, pEdit)
@@ -295,15 +295,15 @@ IMPL_LINK( ScDataFormDlg, Impl_NewHdl, PushButton*, 
EMPTYARG )
 
 if ( bHasData )
 {
-pTabViewShell-DataFormPutData( aCurrentRow , nStartRow , 
nStartCol , nEndRow , nEndCol , maEdits , aColLength );
-aCurrentRow++;
-if (aCurrentRow = nEndRow + 2)
+pTabViewShell-DataFormPutData( nCurrentRow , nStartRow , 
nStartCol , nEndRow , nEndCol , maEdits , aColLength );
+nCurrentRow++;
+if (nCurrentRow = nEndRow + 2)
 {
 nEndRow ++ ;
 aSlider.SetRange( Range( 0, nEndRow - nStartRow + 1) );
 }
 SetButtonState();
-FillCtrls(aCurrentRow);
+FillCtrls(nCurrentRow);
 pDocSh-SetDocumentModified();
 pDocSh-PostPaintGridAll();
 }
@@ -315,11 +315,11 @@ IMPL_LINK( ScDataFormDlg, Impl_PrevHdl, PushButton*, 
EMPTYARG )
 {
 if (pDoc)
 {
-if ( aCurrentRow  nStartRow +1 )
-aCurrentRow--;
+if ( nCurrentRow  nStartRow +1 )
+nCurrentRow--;
 
 SetButtonState();
-FillCtrls(aCurrentRow);
+FillCtrls(nCurrentRow);
 }
 return 0;
 }
@@ -328,11 +328,11 @@ IMPL_LINK( ScDataFormDlg, Impl_NextHdl, PushButton*, 
EMPTYARG )
 {
 if (pDoc)
 {
-if ( aCurrentRow = nEndRow)
-aCurrentRow++;
+if ( nCurrentRow = nEndRow)
+nCurrentRow++;
 
 SetButtonState();
-FillCtrls(aCurrentRow);
+FillCtrls(nCurrentRow);
 }
 return 0;
 }
@@ -341,7 +341,7 @@ IMPL_LINK( ScDataFormDlg, Impl_RestoreHdl, PushButton*, 
EMPTYARG )
 {
 if (pDoc)
 {
-FillCtrls(aCurrentRow);
+FillCtrls(nCurrentRow);
 }
 return 0;
 }
@@ -352,14 +352,14 @@ IMPL_LINK( ScDataFormDlg, Impl_DeleteHdl, PushButton*, 
EMPTYARG )
 ScDocShell* pDocSh = pViewData-GetDocShell();
 if (pDoc)
 {
-ScRange aRange(nStartCol, aCurrentRow, nTab, nEndCol,

[Libreoffice-commits] .: binfilter/inc

2012-01-06 Thread Caolán McNamara 
 binfilter/inc/bf_sfx2/sfxsids.hrc |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 6b7448e04adfd2ecf27f0a28f02ba050826b44c7
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jan 6 16:35:16 2012 +

ditch commented out SID

diff --git a/binfilter/inc/bf_sfx2/sfxsids.hrc 
b/binfilter/inc/bf_sfx2/sfxsids.hrc
index 6961af7..52400dd 100644
--- a/binfilter/inc/bf_sfx2/sfxsids.hrc
+++ b/binfilter/inc/bf_sfx2/sfxsids.hrc
@@ -705,9 +705,6 @@
 #define SID_COPY(SID_SFX_START + 711)
 #define SID_PASTE   (SID_SFX_START + 712)
 
-// steht unter diesem Wert in chaos/cntids.hrc!!!
-//#define SID_DELETE(SID_SFX_START + 713)
-
 #define SID_BACKSPACE   (SID_SFX_START + 714)
 #define SID_SELECT  (SID_SFX_START + 720)
 #define SID_EXPANDSELECTION (SID_SFX_START + 721)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - desktop/util desktop/win32 solenv/inc

2012-01-06 Thread Andras Timar 
 desktop/util/officeloader.rc |   65 -
 desktop/win32/source/applauncher/launcher.rc |   64 -
 solenv/inc/shlinfo.rc|   68 +--
 3 files changed, 95 insertions(+), 102 deletions(-)

New commits:
commit 53faaceac6916d0d35386b7cedd75b8d2171e6ef
Author: Andras Timar ati...@suse.com
Date:   Fri Jan 6 18:28:41 2012 +0100

remove unused VER_FIRSTYEAR

diff --git a/desktop/util/officeloader.rc b/desktop/util/officeloader.rc
index 1e00af6..69710f2 100644
--- a/desktop/util/officeloader.rc
+++ b/desktop/util/officeloader.rc
@@ -25,8 +25,6 @@
  *
  */
 
-#define VER_FIRSTYEAR2000
-
 #include windows.h
 #include version.hrc
 
diff --git a/desktop/win32/source/applauncher/launcher.rc 
b/desktop/win32/source/applauncher/launcher.rc
index 04dbe9f..3857d62 100644
--- a/desktop/win32/source/applauncher/launcher.rc
+++ b/desktop/win32/source/applauncher/launcher.rc
@@ -25,8 +25,6 @@
  *
  */
 
-#define VER_FIRSTYEAR2009
-
 #include windows.h
 #include version.hrc
 
diff --git a/solenv/inc/shlinfo.rc b/solenv/inc/shlinfo.rc
index 1fca687..2176bbf 100644
--- a/solenv/inc/shlinfo.rc
+++ b/solenv/inc/shlinfo.rc
@@ -25,8 +25,6 @@
  *
  /
 
-#define VER_FIRSTYEAR2010
-
 #include windows.h
 #include version.hrc
 
commit 19eaa578790c6b7c72838353954d1e8f7b26fb3e
Author: Andras Timar ati...@suse.com
Date:   Fri Jan 6 18:27:25 2012 +0100

tabs to spaces

diff --git a/desktop/util/officeloader.rc b/desktop/util/officeloader.rc
index b6e2687..1e00af6 100644
--- a/desktop/util/officeloader.rc
+++ b/desktop/util/officeloader.rc
@@ -25,51 +25,51 @@
  *
  */
 
-#define VER_FIRSTYEAR  2000
+#define VER_FIRSTYEAR2000
 
 #include windows.h
 #include version.hrc
 
 // ---
-// version information
+// version information
 // ---
 
 VS_VERSION_INFO VERSIONINFO
-   FILEVERSIONVERSION, SUBVERSION, MICROVERSION, VERVARIANT
-   PRODUCTVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT
-   FILEFLAGSMASK 0x3F
-   FILEFLAGS
+FILEVERSIONVERSION, SUBVERSION, MICROVERSION, VERVARIANT
+PRODUCTVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT
+FILEFLAGSMASK 0x3F
+FILEFLAGS
 #if defined(DEBUG)
-   VS_FF_DEBUG |
+VS_FF_DEBUG |
 #endif
 #ifdef VER_PREL
-   VS_FF_PRERELEASE |
+VS_FF_PRERELEASE |
 #endif
-   0
-   FILEOS VOS_NT_WINDOWS32
-   FILETYPE VFT_APP
-   {
-   BLOCK StringFileInfo
-   {
-   BLOCK 040904E4
-   {
-   // International StringTable
-VALUE CompanyName,   PPS(RES_APP_VENDOR) \0
-   VALUE FileDescription,
\0
-   VALUE FileVersion,PPS(VER_LEVEL) 
\0
-   VALUE ProductVersion, PPS(VER_LEVEL) 
\0
-   VALUE ProductName,LibreOffice\0
-   VALUE OriginalFilename,   
PPS(RES_APP_NAME) .exe\0
-   VALUE InternalName,   
PPS(RES_APP_NAME) \0
-   VALUE LegalCopyright, S_CRIGHT  
LibreOffice contributors and/or their affiliates. All rights reserved.\0
-   }
-   }
+0
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_APP
+{
+BLOCK StringFileInfo
+{
+BLOCK 040904E4
+{
+// International StringTable
+VALUE CompanyName,  PPS(RES_APP_VENDOR) \0
+VALUE FileDescription,  
\0
+VALUE FileVersion,  PPS(VER_LEVEL) \0
+VALUE ProductVersion,   PPS(VER_LEVEL) \0
+VALUE ProductName,  LibreOffice\0
+VALUE OriginalFilename, PPS(RES_APP_NAME) .exe\0
+VALUE InternalName, PPS(RES_APP_NAME) \0
+VALUE LegalCopyright,   S_CRIGHT  LibreOffice contributors 
and/or their affiliates. All rights reserved.\0
+}
+}
 
-   BLOCK VarFileInfo
-   {
-   VALUE Translation, 0x0409, 1252
-   }
-   }
+BLOCK VarFileInfo
+{
+VALUE Translation, 0x0409, 1252
+}
+

[Libreoffice-commits] .: basegfx/source

2012-01-06 Thread Julien Nabet 
 basegfx/source/polygon/b2dpolypolygoncutter.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 66fd9a610cd876c236486a2089d8d58dca866e25
Author: Julien Nabet serval2...@yahoo.fr
Date:   Fri Jan 6 18:57:39 2012 +0100

Fix Same expression on both sides of '' (reported by cppcheck)

diff --git a/basegfx/source/polygon/b2dpolypolygoncutter.cxx 
b/basegfx/source/polygon/b2dpolypolygoncutter.cxx
index d32ee87..8745241 100644
--- a/basegfx/source/polygon/b2dpolypolygoncutter.cxx
+++ b/basegfx/source/polygon/b2dpolypolygoncutter.cxx
@@ -282,7 +282,7 @@ namespace basegfx
 bOnEdge = false;
 }
 }
-while(bOnEdge  pPNa2 != rPNa  pPNa2 != rPNa);
+while(bOnEdge  pPNa2 != rPNa  pPNb2 != rPNb);
 
 if(bOnEdge)
 {
@@ -408,7 +408,7 @@ namespace basegfx
 bOnEdge = false;
 }
 }
-while(bOnEdge  pPNa2 != rPNa  pPNa2 != rPNa);
+while(bOnEdge  pPNa2 != rPNa  pPNb2 != rPNb);
 
 if(bOnEdge)
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: scp2/source scp2/util

2012-01-06 Thread Andras Timar 
 scp2/source/ooo/makefile.mk   |1 
 scp2/source/ooo/vc_redist.scp |   60 --
 scp2/util/makefile.mk |1 
 3 files changed, 62 deletions(-)

New commits:
commit 7a3ef2719eb68d2862354181ca5a906129569a57
Author: Andras Timar ati...@suse.com
Date:   Fri Jan 6 19:33:42 2012 +0100

remove vc_redist from scp2

diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 96bcb5f..c5443e9 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -343,7 +343,6 @@ PARFILES +=\
 folder_ooo.par \
 folderitem_ooo.par \
 registryitem_ooo.par   \
-vc_redist.par  \
 mingw_dlls.par \
 windowscustomaction_ooo.par
 .ENDIF
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
deleted file mode 100644
index a01f891..000
--- a/scp2/source/ooo/vc_redist.scp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
-/
-
-#include macros.inc
-
-#if defined(WITH_VC_REDIST)
-
-MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86
-Feature = gm_Root;
-Name = Microsoft_VC90_CRT_x86.msm;
-RootDir = TARGETDIR;
-End
-
-MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86
-Feature = gm_Root;
-Name = policy_9_0_Microsoft_VC90_CRT_x86.msm;
-RootDir = TARGETDIR;
-End
-
-#if defined(BUILD_X64)
-
-MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86_x64
-Feature = gm_Root;
-Name = Microsoft_VC90_CRT_x86_x64.msm;
-RootDir = TARGETDIR;
-End
-
-MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86_x64
-Feature = gm_Root;
-Name = policy_9_0_Microsoft_VC90_CRT_x86_x64.msm;
-RootDir = TARGETDIR;
-End
-
-#endif
-
-#endif
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index 9af2c3a..42e026d 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -148,7 +148,6 @@ SCP1FILES +=   \
  folder_ooo.par\
  folderitem_ooo.par\
  windowscustomaction_ooo.par \
- vc_redist.par \
  mingw_dlls.par\
  registryitem_writer.par   \
  folderitem_writer.par \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: scp2/source scp2/util

2012-01-06 Thread Andras Timar 
 scp2/source/ooo/makefile.mk   |1 
 scp2/source/ooo/vc_redist.scp |   60 ++
 scp2/util/makefile.mk |1 
 3 files changed, 62 insertions(+)

New commits:
commit c586383617e7b9f2a0e24db8aaf1e1fd560bdbc4
Author: Andras Timar ati...@suse.com
Date:   Fri Jan 6 19:36:54 2012 +0100

Revert remove vc_redist from scp2

This reverts commit 7a3ef2719eb68d2862354181ca5a906129569a57.
Eh, better to stop for now...

diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index c5443e9..96bcb5f 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -343,6 +343,7 @@ PARFILES +=\
 folder_ooo.par \
 folderitem_ooo.par \
 registryitem_ooo.par   \
+vc_redist.par  \
 mingw_dlls.par \
 windowscustomaction_ooo.par
 .ENDIF
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
new file mode 100644
index 000..a01f891
--- /dev/null
+++ b/scp2/source/ooo/vc_redist.scp
@@ -0,0 +1,60 @@
+/*
+*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * http://www.openoffice.org/license.html
+ * for a copy of the LGPLv3 License.
+ *
+/
+
+#include macros.inc
+
+#if defined(WITH_VC_REDIST)
+
+MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86
+Feature = gm_Root;
+Name = Microsoft_VC90_CRT_x86.msm;
+RootDir = TARGETDIR;
+End
+
+MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86
+Feature = gm_Root;
+Name = policy_9_0_Microsoft_VC90_CRT_x86.msm;
+RootDir = TARGETDIR;
+End
+
+#if defined(BUILD_X64)
+
+MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86_x64
+Feature = gm_Root;
+Name = Microsoft_VC90_CRT_x86_x64.msm;
+RootDir = TARGETDIR;
+End
+
+MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86_x64
+Feature = gm_Root;
+Name = policy_9_0_Microsoft_VC90_CRT_x86_x64.msm;
+RootDir = TARGETDIR;
+End
+
+#endif
+
+#endif
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index 42e026d..9af2c3a 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -148,6 +148,7 @@ SCP1FILES +=   \
  folder_ooo.par\
  folderitem_ooo.par\
  windowscustomaction_ooo.par \
+ vc_redist.par \
  mingw_dlls.par\
  registryitem_writer.par   \
  folderitem_writer.par \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-01-06 Thread Andras Timar 
 sc/source/ui/inc/anyrefdg.hxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit cf31d38e36690c21fba0c218847bb89e1395df19
Author: Korrawit Pruegsanusak detective.conan.1...@gmail.com
Date:   Wed Dec 21 21:50:46 2011 +0700

Revert this to build on msvc 2008

diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index ef44b61..8bca700 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -189,7 +189,7 @@ public:
 //
 
 template  class TWindow, bool bBindRef = true 
-class SC_DLLPUBLIC ScRefHdlrImplBase:public TWindow, public ScRefHandler
+class ScRefHdlrImplBase:public TWindow, public ScRefHandler
 {
 public:
 //Overwrite TWindow
@@ -211,16 +211,16 @@ private:
 
 templateclass TWindow, bool bBindRef
 templateclass TBindings, class TChildWindow, class TParentWindow, class 
TResId
-SC_DLLPUBLIC ScRefHdlrImplBaseTWindow, bBindRef::ScRefHdlrImplBase( 
TBindings* pB, TChildWindow* pCW,
+ScRefHdlrImplBaseTWindow, bBindRef::ScRefHdlrImplBase( TBindings* pB, 
TChildWindow* pCW,
  TParentWindow* pParent, TResId nResId):TWindow(pB, pCW, 
pParent, ScResId(static_castsal_uInt16( nResId ) ) ), ScRefHandler( 
*static_castTWindow*(this), pB, bBindRef ){}
 
 templateclass TWindow, bool bBindRef 
 templateclass TParentWindow, class TResId, class TArg
-SC_DLLPUBLIC ScRefHdlrImplBaseTWindow,bBindRef::ScRefHdlrImplBase( 
TParentWindow* pParent, TResId nResIdP, const TArg rArg, SfxBindings *pB /*= 
NULL*/ )
+ScRefHdlrImplBaseTWindow,bBindRef::ScRefHdlrImplBase( TParentWindow* 
pParent, TResId nResIdP, const TArg rArg, SfxBindings *pB /*= NULL*/ )
 :TWindow( pParent, ScResId(static_castsal_uInt16( nResIdP )), rArg ), 
ScRefHandler( *static_castTWindow*(this), pB, bBindRef ){}
 
 templateclass TWindow, bool bBindRef 
-SC_DLLPUBLIC ScRefHdlrImplBaseTWindow,bBindRef::~ScRefHdlrImplBase(){}
+ScRefHdlrImplBaseTWindow,bBindRef::~ScRefHdlrImplBase(){}
 
 //
 templateclass TDerived, class TBase, bool bBindRef = true
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-01-06 Thread Kohei Yoshida 
 sc/inc/userdat.hxx   |4 +++-
 sc/source/core/data/drwlayer.cxx |   11 +--
 sc/source/core/data/postit.cxx   |2 +-
 sc/source/core/data/userdat.cxx  |2 +-
 sc/source/core/tool/detfunc.cxx  |1 +
 sc/source/ui/view/drawvie3.cxx   |2 +-
 6 files changed, 12 insertions(+), 10 deletions(-)

New commits:
commit 753259a6b5a1b9ac4a270d4a38c7111714b9
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Fri Jan 6 16:24:07 2012 -0500

Fix re-calculation of the position of circular drawing objects.

Cell-anchored circular drawing objects would get distorted whenever
its bounding rectangle changes, either via insertion / removal of
columns / rows, or changing the row height / column width.

This commit fixes it by differentiating the validation circles, which
needs its own re-calc algorithm, from the normal circular drawing
objects.

diff --git a/sc/inc/userdat.hxx b/sc/inc/userdat.hxx
index 259e99d..ed6adc2 100644
--- a/sc/inc/userdat.hxx
+++ b/sc/inc/userdat.hxx
@@ -59,11 +59,13 @@ public:
 class ScDrawObjData : public SdrObjUserData
 {
 public:
+enum Type { CellNote, ValidationCircle, DrawingObject };
+
 ScAddress   maStart;
 ScAddress   maEnd;
 Point   maStartOffset;
 Point   maEndOffset;
-boolmbNote;
+TypemeType;
 Rectangle   maLastRect;
 
 explicitScDrawObjData();
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 2e2d00a..91820f4 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -610,7 +610,7 @@ void ScDrawLayer::RecalcPos( SdrObject* pObj, 
ScDrawObjData rData, bool bNegati
 if( !pDoc )
 return;
 
-if( rData.mbNote )
+if (rData.meType == ScDrawObjData::CellNote)
 {
 OSL_ENSURE( rData.maStart.IsValid(), ScDrawLayer::RecalcPos - invalid 
position for cell note );
 /*  #i109372# On insert/remove rows/columns/cells: Updating the caption
@@ -636,13 +636,12 @@ void ScDrawLayer::RecalcPos( SdrObject* pObj, 
ScDrawObjData rData, bool bNegati
 SCROW nRow2 = rData.maEnd.Row();
 SCTAB nTab2 = rData.maEnd.Tab();
 
-// validation circle
-bool bCircle = pObj-ISA( SdrCircObj );
 // detective arrow
 bool bArrow = pObj-IsPolyObj()  (pObj-GetPointCount() == 2);
 
-if( bCircle )
+if (rData.meType == ScDrawObjData::ValidationCircle)
 {
+// Validation circle for detective.
 rData.maLastRect = pObj-GetLogicRect();
 
 Point aPos( pDoc-GetColOffset( nCol1, nTab1 ), pDoc-GetRowOffset( 
nRow1, nTab1 ) );
@@ -1835,13 +1834,13 @@ ScDrawObjData* ScDrawLayer::GetObjDataTab( SdrObject* 
pObj, SCTAB nTab )
 bool ScDrawLayer::IsNoteCaption( SdrObject* pObj )
 {
 ScDrawObjData* pData = pObj ? GetObjData( pObj ) : 0;
-return pData  pData-mbNote;
+return pData  pData-meType == ScDrawObjData::CellNote;
 }
 
 ScDrawObjData* ScDrawLayer::GetNoteCaptionData( SdrObject* pObj, SCTAB nTab )
 {
 ScDrawObjData* pData = pObj ? GetObjDataTab( pObj, nTab ) : 0;
-return (pData  pData-mbNote) ? pData : 0;
+return (pData  pData-meType == ScDrawObjData::CellNote) ? pData : 0;
 }
 
 ScIMapInfo* ScDrawLayer::GetIMapInfo( SdrObject* pObj )
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index a8881c0..04001c3 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -109,7 +109,7 @@ void ScCaptionUtil::SetCaptionUserData( SdrCaptionObj 
rCaption, const ScAddress
 ScDrawObjData* pObjData = ScDrawLayer::GetObjData( rCaption, true );
 OSL_ENSURE( pObjData, ScCaptionUtil::SetCaptionUserData - missing drawing 
object user data );
 pObjData-maStart = rPos;
-pObjData-mbNote = true;
+pObjData-meType = ScDrawObjData::CellNote;
 }
 
 void ScCaptionUtil::SetDefaultItems( SdrCaptionObj rCaption, ScDocument rDoc 
)
diff --git a/sc/source/core/data/userdat.cxx b/sc/source/core/data/userdat.cxx
index 2b2db80..6947634 100644
--- a/sc/source/core/data/userdat.cxx
+++ b/sc/source/core/data/userdat.cxx
@@ -70,7 +70,7 @@ ScDrawObjData::ScDrawObjData() :
 SdrObjUserData( SC_DRAWLAYER, SC_UD_OBJDATA, 0 ),
 maStart( ScAddress::INITIALIZE_INVALID ),
 maEnd( ScAddress::INITIALIZE_INVALID ),
-mbNote( false )
+meType( DrawingObject )
 {
 }
 
diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx
index 567ba49..ebf9ef8 100644
--- a/sc/source/core/tool/detfunc.cxx
+++ b/sc/source/core/tool/detfunc.cxx
@@ -681,6 +681,7 @@ void ScDetectiveFunc::DrawCircle( SCCOL nCol, SCROW nRow, 
ScDetectiveData rData
 ScDrawObjData* pData = ScDrawLayer::GetObjData( pCircle, sal_True );
 pData-maStart.Set( nCol, nRow, nTab);
 pData-maEnd.SetInvalid();
+pData-meType = ScDrawObjData::ValidationCircle;
 
 Modified();
 }
diff --git a/sc/source/ui/view/drawvie3.cxx

[Libreoffice-commits] .: solenv/bin

2012-01-06 Thread Michael Stahl 
 solenv/bin/make_installer.pl |1 -
 1 file changed, 1 deletion(-)

New commits:
commit bf6ccec6334141be5e0247f9cf3f34762f668e40
Author: Michael Stahl mst...@redhat.com
Date:   Fri Jan 6 22:27:42 2012 +0100

solenv: that perl crud looks unhappy

diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 57dd86c..5bcee7f 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -73,7 +73,6 @@ use installer::windows::font;
 use installer::windows::icon;
 use installer::windows::idtglobal;
 use installer::windows::inifile;
-use installer::windows::java;
 use installer::windows::media;
 use installer::windows::mergemodule;
 use installer::windows::msiglobal;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-01-06 Thread Kohei Yoshida 
 sc/inc/userdat.hxx   |4 +++-
 sc/source/core/data/drwlayer.cxx |   11 +--
 sc/source/core/data/postit.cxx   |2 +-
 sc/source/core/data/userdat.cxx  |2 +-
 sc/source/core/tool/detfunc.cxx  |1 +
 sc/source/ui/view/drawvie3.cxx   |2 +-
 6 files changed, 12 insertions(+), 10 deletions(-)

New commits:
commit 248a6136b898389a5d3d351859591b2de458ce90
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Fri Jan 6 16:24:07 2012 -0500

Fix re-calculation of the position of circular drawing objects.

Cell-anchored circular drawing objects would get distorted whenever
its bounding rectangle changes, either via insertion / removal of
columns / rows, or changing the row height / column width.

This commit fixes it by differentiating the validation circles, which
needs its own re-calc algorithm, from the normal circular drawing
objects.

diff --git a/sc/inc/userdat.hxx b/sc/inc/userdat.hxx
index 259e99d..ed6adc2 100644
--- a/sc/inc/userdat.hxx
+++ b/sc/inc/userdat.hxx
@@ -59,11 +59,13 @@ public:
 class ScDrawObjData : public SdrObjUserData
 {
 public:
+enum Type { CellNote, ValidationCircle, DrawingObject };
+
 ScAddress   maStart;
 ScAddress   maEnd;
 Point   maStartOffset;
 Point   maEndOffset;
-boolmbNote;
+TypemeType;
 Rectangle   maLastRect;
 
 explicitScDrawObjData();
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 2e2d00a..91820f4 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -610,7 +610,7 @@ void ScDrawLayer::RecalcPos( SdrObject* pObj, 
ScDrawObjData rData, bool bNegati
 if( !pDoc )
 return;
 
-if( rData.mbNote )
+if (rData.meType == ScDrawObjData::CellNote)
 {
 OSL_ENSURE( rData.maStart.IsValid(), ScDrawLayer::RecalcPos - invalid 
position for cell note );
 /*  #i109372# On insert/remove rows/columns/cells: Updating the caption
@@ -636,13 +636,12 @@ void ScDrawLayer::RecalcPos( SdrObject* pObj, 
ScDrawObjData rData, bool bNegati
 SCROW nRow2 = rData.maEnd.Row();
 SCTAB nTab2 = rData.maEnd.Tab();
 
-// validation circle
-bool bCircle = pObj-ISA( SdrCircObj );
 // detective arrow
 bool bArrow = pObj-IsPolyObj()  (pObj-GetPointCount() == 2);
 
-if( bCircle )
+if (rData.meType == ScDrawObjData::ValidationCircle)
 {
+// Validation circle for detective.
 rData.maLastRect = pObj-GetLogicRect();
 
 Point aPos( pDoc-GetColOffset( nCol1, nTab1 ), pDoc-GetRowOffset( 
nRow1, nTab1 ) );
@@ -1835,13 +1834,13 @@ ScDrawObjData* ScDrawLayer::GetObjDataTab( SdrObject* 
pObj, SCTAB nTab )
 bool ScDrawLayer::IsNoteCaption( SdrObject* pObj )
 {
 ScDrawObjData* pData = pObj ? GetObjData( pObj ) : 0;
-return pData  pData-mbNote;
+return pData  pData-meType == ScDrawObjData::CellNote;
 }
 
 ScDrawObjData* ScDrawLayer::GetNoteCaptionData( SdrObject* pObj, SCTAB nTab )
 {
 ScDrawObjData* pData = pObj ? GetObjDataTab( pObj, nTab ) : 0;
-return (pData  pData-mbNote) ? pData : 0;
+return (pData  pData-meType == ScDrawObjData::CellNote) ? pData : 0;
 }
 
 ScIMapInfo* ScDrawLayer::GetIMapInfo( SdrObject* pObj )
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index a8881c0..04001c3 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -109,7 +109,7 @@ void ScCaptionUtil::SetCaptionUserData( SdrCaptionObj 
rCaption, const ScAddress
 ScDrawObjData* pObjData = ScDrawLayer::GetObjData( rCaption, true );
 OSL_ENSURE( pObjData, ScCaptionUtil::SetCaptionUserData - missing drawing 
object user data );
 pObjData-maStart = rPos;
-pObjData-mbNote = true;
+pObjData-meType = ScDrawObjData::CellNote;
 }
 
 void ScCaptionUtil::SetDefaultItems( SdrCaptionObj rCaption, ScDocument rDoc 
)
diff --git a/sc/source/core/data/userdat.cxx b/sc/source/core/data/userdat.cxx
index 2b2db80..6947634 100644
--- a/sc/source/core/data/userdat.cxx
+++ b/sc/source/core/data/userdat.cxx
@@ -70,7 +70,7 @@ ScDrawObjData::ScDrawObjData() :
 SdrObjUserData( SC_DRAWLAYER, SC_UD_OBJDATA, 0 ),
 maStart( ScAddress::INITIALIZE_INVALID ),
 maEnd( ScAddress::INITIALIZE_INVALID ),
-mbNote( false )
+meType( DrawingObject )
 {
 }
 
diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx
index 567ba49..ebf9ef8 100644
--- a/sc/source/core/tool/detfunc.cxx
+++ b/sc/source/core/tool/detfunc.cxx
@@ -681,6 +681,7 @@ void ScDetectiveFunc::DrawCircle( SCCOL nCol, SCROW nRow, 
ScDetectiveData rData
 ScDrawObjData* pData = ScDrawLayer::GetObjData( pCircle, sal_True );
 pData-maStart.Set( nCol, nRow, nTab);
 pData-maEnd.SetInvalid();
+pData-meType = ScDrawObjData::ValidationCircle;
 
 Modified();
 }
diff --git a/sc/source/ui/view/drawvie3.cxx

[Libreoffice-commits] .: solenv/gbuild

2012-01-06 Thread Andras Timar 
 solenv/gbuild/platform/WNT_INTEL_MSC.mk |   14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

New commits:
commit c7c65bc0d746b7fa6f63d7e76dc22202e689db09
Author: Andras Timar ati...@suse.com
Date:   Fri Jan 6 23:17:43 2012 +0100

link versioninfo resource to dlls

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 318e0d2..284572a 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -474,10 +474,10 @@ $(call gb_Library_get_clean_target,$(1)) : AUXTARGETS +=  
\
$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.pdb,$(3))) \
$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.ilk,$(3))) \
 
-$(call gb_Library_add_default_nativeres,$(1),$(1)/default)
-
 endif
 
+$(call gb_Library_add_default_nativeres,$(1),$(1)/default)
+
 $(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3),$(1))
 
 $(call gb_LinkTarget_get_target,$(2)) \
@@ -490,9 +490,13 @@ $(call gb_WinResTarget_WinResTarget_init,$(2))
 $(call gb_WinResTarget_add_file,$(2),solenv/inc/shlinfo)
 $(call gb_WinResTarget_set_defs,$(2),\
$$(DEFS) \
-   -DADDITIONAL_VERINFO1 \
-   -DADDITIONAL_VERINFO2 \
-   -DADDITIONAL_VERINFO3 \
+   -DVERVARIANT=$(BUILD) \
+   -DRES_APP_VENDOR=$(OOO_VENDOR) \
+   -DORG_NAME=$(call gb_Library_get_dllname,$(1))\
+   -DINTERNAL_NAME=$(subst $(gb_Library_DLLEXT),,$(call 
gb_Library_get_dllname,$(1))) \
+   -DADDITIONAL_VERINFO1= \
+   -DADDITIONAL_VERINFO2= \
+   -DADDITIONAL_VERINFO3= \
 )
 $(call gb_Library_add_nativeres,$(1),$(2))
 $(call gb_Library_get_clean_target,$(1)) : $(call 
gb_WinResTarget_get_clean_target,$(2))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

2012-01-06 Thread Kohei Yoshida 
 sc/source/ui/view/cellsh2.cxx |1 +
 sc/source/ui/view/tabview.cxx |   14 ++
 2 files changed, 3 insertions(+), 12 deletions(-)

New commits:
commit e0ea1b528428ac5ee450ed06f80a23e1125cd09b
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Fri Jan 6 17:30:27 2012 -0500

Fixed the validation message popup disappearing when scrolling etc.

When the popup goes outside the visible area  get scrolled back in,
it would disappear.  Also, when setting the hint message on in the
dialog and clicking OK should show the popup right away.

diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index dcc4d9f..a51e8b9 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -911,6 +911,7 @@ void ScCellShell::ExecuteDB( SfxRequest rReq )
 aData.ResetError(); // 
reset only bShowError
 
 pTabViewShell-SetValidation( aData );
+pTabViewShell-TestHintWindow();
 rReq.Done( *pOutSet );
 }
 //after end execute from !IsModalInputMode, it is safer to 
delay deleting
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 6d1652f..a5fdf31 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -1301,10 +1301,6 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll )
 
 void ScTabView::ScrollX( long nDeltaX, ScHSplitPos eWhich, bool bUpdBars )
 {
-bool bHasHint = HasHintWindow();
-if (bHasHint)
-RemoveHintWindow();
-
 SCCOL nOldX = aViewData.GetPosX(eWhich);
 SCsCOL nNewX = static_castSCsCOL(nOldX) + static_castSCsCOL(nDeltaX);
 if ( nNewX  0 )
@@ -1384,16 +1380,11 @@ void ScTabView::ScrollX( long nDeltaX, ScHSplitPos 
eWhich, bool bUpdBars )
 
 SetNewVisArea();// MapMode muss schon gesetzt sein
 
-if (bHasHint)
-TestHintWindow();   // neu positionieren
+TestHintWindow();
 }
 
 void ScTabView::ScrollY( long nDeltaY, ScVSplitPos eWhich, bool bUpdBars )
 {
-bool bHasHint = HasHintWindow();
-if (bHasHint)
-RemoveHintWindow();
-
 SCROW nOldY = aViewData.GetPosY(eWhich);
 SCsROW nNewY = static_castSCsROW(nOldY) + static_castSCsROW(nDeltaY);
 if ( nNewY  0 )
@@ -1474,8 +1465,7 @@ void ScTabView::ScrollY( long nDeltaY, ScVSplitPos 
eWhich, bool bUpdBars )
 
 SetNewVisArea();// MapMode muss schon gesetzt sein
 
-if (bHasHint)
-TestHintWindow();   // neu positionieren
+TestHintWindow();
 }
 
 void ScTabView::ScrollLines( long nDeltaX, long nDeltaY )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: extensions/Executable_nsplugin.mk

2012-01-06 Thread Matus Kukan 
 extensions/Executable_nsplugin.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 259e51677bde56dbfc45e41b28ae3bdfd08a0e82
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Fri Jan 6 23:34:35 2012 +0100

extensions: nsplugin: dl is for linux

diff --git a/extensions/Executable_nsplugin.mk 
b/extensions/Executable_nsplugin.mk
index e328a5c..6bc58fb 100644
--- a/extensions/Executable_nsplugin.mk
+++ b/extensions/Executable_nsplugin.mk
@@ -46,7 +46,7 @@ $(eval $(call gb_Executable_add_linked_libs,nsplugin,\
cppu \
cppuhelper \
sal \
-   $(if $(filter $(GUI),UNX), \
+   $(if $(filter $(OS),LINUX), \
dl \
) \
$(if $(filter $(OS),SOLARIS), \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - binfilter/bf_so3 binfilter/inc

2012-01-06 Thread Michael Stahl 
 binfilter/bf_so3/source/solink/impldde.hxx |1 +
 binfilter/inc/bf_basic/sbstar.hxx  |1 +
 binfilter/inc/bf_sc/cellsuno.hxx   |1 +
 binfilter/inc/bf_sfx2/fcontnr.hxx  |1 +
 binfilter/inc/bf_sw/crsrsh.hxx |1 +
 5 files changed, 5 insertions(+)

New commits:
commit 9203883b8e0881ce2ab46c2899e788f922a9f086
Author: Marcel Metz mm...@adrian-broher.net
Date:   Fri Jan 6 23:19:41 2012 +0100

Removed unnecessary tools/ref.hxx includes

diff --git a/binfilter/inc/bf_sfx2/fcontnr.hxx 
b/binfilter/inc/bf_sfx2/fcontnr.hxx
index 07f9c75..13d62fb 100644
--- a/binfilter/inc/bf_sfx2/fcontnr.hxx
+++ b/binfilter/inc/bf_sfx2/fcontnr.hxx
@@ -35,6 +35,7 @@
 
 #include bf_sfx2/docfilt.hxx
 #include bf_sfx2/sfxdefs.hxx
+#include tools/ref.hxx
 class Window;
 namespace binfilter {
 
commit d08821beaa72ff1d86419dfb69203a1c28f8d9c8
Author: Marcel Metz mm...@adrian-broher.net
Date:   Fri Jan 6 23:18:39 2012 +0100

Removed unnecessary tools/link.hxx includes

diff --git a/binfilter/bf_so3/source/solink/impldde.hxx 
b/binfilter/bf_so3/source/solink/impldde.hxx
index f050eca..3a9b714 100644
--- a/binfilter/bf_so3/source/solink/impldde.hxx
+++ b/binfilter/bf_so3/source/solink/impldde.hxx
@@ -29,6 +29,7 @@
 #define _IMPLDDE_HXX
 
 #include bf_so3/linksrc.hxx
+#include tools/link.hxx
 #include tools/string.hxx
 
 namespace binfilter
diff --git a/binfilter/inc/bf_basic/sbstar.hxx 
b/binfilter/inc/bf_basic/sbstar.hxx
index 0113ab4..fbdea26 100644
--- a/binfilter/inc/bf_basic/sbstar.hxx
+++ b/binfilter/inc/bf_basic/sbstar.hxx
@@ -33,6 +33,7 @@
 
 #include sbx.hxx
 #include bf_basic/sbxobj.hxx
+#include tools/link.hxx
 #include rtl/ustring.hxx
 #include osl/mutex.hxx
 
diff --git a/binfilter/inc/bf_sc/cellsuno.hxx b/binfilter/inc/bf_sc/cellsuno.hxx
index d14593b..cc78428 100644
--- a/binfilter/inc/bf_sc/cellsuno.hxx
+++ b/binfilter/inc/bf_sc/cellsuno.hxx
@@ -89,6 +89,7 @@
 #include cppuhelper/implbase2.hxx
 #include cppuhelper/implbase3.hxx
 
+#include tools/link.hxx
 #include vector
 namespace binfilter {
 
diff --git a/binfilter/inc/bf_sw/crsrsh.hxx b/binfilter/inc/bf_sw/crsrsh.hxx
index 8ede44a..fdd8756 100644
--- a/binfilter/inc/bf_sw/crsrsh.hxx
+++ b/binfilter/inc/bf_sw/crsrsh.hxx
@@ -30,6 +30,7 @@
 
 #include bf_svtools/bf_solar.h
 
+#include tools/link.hxx
 #include tools/string.hxx
 
 #include viewsh.hxx   // fuer ViewShell
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - sc/inc sc/qa sc/source

2012-01-06 Thread Markus Mohrhard 
 sc/inc/document.hxx  |   12 -
 sc/inc/externalrefmgr.hxx|   30 
 sc/inc/globstr.hrc   |4 
 sc/inc/rangenam.hxx  |1 
 sc/inc/tokenarray.hxx|   15 ++
 sc/qa/unit/ucalc.cxx |2 
 sc/source/core/data/cell.cxx |   14 ++
 sc/source/core/data/documen2.cxx |   24 ++-
 sc/source/core/data/document.cxx |  195 +++
 sc/source/core/tool/rangenam.cxx |9 +
 sc/source/core/tool/reftokenhelper.cxx   |5 
 sc/source/core/tool/token.cxx|  174 +++
 sc/source/ui/docshell/docsh.cxx  |   31 ++--
 sc/source/ui/docshell/externalrefmgr.cxx |   86 +
 sc/source/ui/inc/namemgrtable.hxx|4 
 sc/source/ui/namedlg/namedlg.cxx |2 
 sc/source/ui/namedlg/namemgrtable.cxx|7 -
 sc/source/ui/namedlg/namepast.cxx|5 
 sc/source/ui/src/globstr.src |8 +
 sc/source/ui/view/viewfun2.cxx   |5 
 20 files changed, 473 insertions(+), 160 deletions(-)

New commits:
commit 34b417914e041e93ddbf6035b855658d3b947636
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Jan 5 17:26:25 2012 +

handle relative refs in name dialogs correctly

diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx
index 4b4f8d9..0e8de43 100644
--- a/sc/inc/rangenam.hxx
+++ b/sc/inc/rangenam.hxx
@@ -135,6 +135,7 @@ public:
 sal_uInt32  GetUnoType() const;
 SC_DLLPUBLIC void GetSymbol( String rSymbol, const 
formula::FormulaGrammar::Grammar eGrammar = 
formula::FormulaGrammar::GRAM_DEFAULT ) const;
 SC_DLLPUBLIC void GetSymbol( rtl::OUString rSymbol, const 
formula::FormulaGrammar::Grammar eGrammar = 
formula::FormulaGrammar::GRAM_DEFAULT ) const;
+SC_DLLPUBLIC void GetSymbol( rtl::OUString rSymbol, const ScAddress 
rPos, const formula::FormulaGrammar::Grammar eGrammar = 
formula::FormulaGrammar::GRAM_DEFAULT ) const;
 voidUpdateSymbol( rtl::OUStringBuffer rBuffer, const 
ScAddress,
 const formula::FormulaGrammar::Grammar 
eGrammar = formula::FormulaGrammar::GRAM_DEFAULT );
 voidUpdateReference( UpdateRefMode eUpdateRefMode,
diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index a471512..8ebcc76 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -277,6 +277,15 @@ void ScRangeData::GetSymbol( OUString rSymbol, const 
FormulaGrammar::Grammar eG
 rSymbol = aStr;
 }
 
+void ScRangeData::GetSymbol( OUString rSymbol, const ScAddress rPos, const 
FormulaGrammar::Grammar eGrammar ) const
+{
+String aStr;
+ScCompiler aComp(pDoc, rPos, *pCode);
+aComp.SetGrammar(eGrammar);
+aComp.CreateStringFromTokenArray( aStr );
+rSymbol = aStr;
+}
+
 void ScRangeData::UpdateSymbol( rtl::OUStringBuffer rBuffer, const ScAddress 
rPos,
 const FormulaGrammar::Grammar eGrammar )
 {
diff --git a/sc/source/ui/inc/namemgrtable.hxx 
b/sc/source/ui/inc/namemgrtable.hxx
index 3023e29..3646164 100644
--- a/sc/source/ui/inc/namemgrtable.hxx
+++ b/sc/source/ui/inc/namemgrtable.hxx
@@ -31,6 +31,7 @@
 #include vcl/ctrl.hxx
 
 #include scresid.hxx
+#include address.hxx
 
 #include vector
 #include boost/ptr_container/ptr_map.hpp
@@ -71,6 +72,7 @@ private:
 // otherwise opening the dialog with a lot of range names is extremelly 
slow because
 // we would calculate all formula strings during opening
 std::mapSvLBoxEntry*, bool maCalculatedFormulaEntries;
+const ScAddress maPos;
 
 void GetLine(ScRangeNameLine aLine, SvLBoxEntry* pEntry);
 void Init();
@@ -78,7 +80,7 @@ private:
 const ScRangeData* findRangeData(const ScRangeNameLine rLine);
 
 public:
-ScRangeManagerTable( Window* pParent, boost::ptr_maprtl::OUString, 
ScRangeName aTabRangeNames );
+ScRangeManagerTable( Window* pParent, boost::ptr_maprtl::OUString, 
ScRangeName aTabRangeNames, const ScAddress rPos );
 virtual ~ScRangeManagerTable();
 
 void addEntry( const ScRangeNameLine rLine, bool bSetCurEntry = true );
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index a485986..56c50e8 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -144,7 +144,7 @@ void ScNameDlg::Init()
 //init UI
 maFtInfo.SetStyle(WB_VCENTER);
 
-mpRangeManagerTable = new ScRangeManagerTable(maNameMgrCtrl, maRangeMap);
+mpRangeManagerTable = new ScRangeManagerTable(maNameMgrCtrl, maRangeMap, 
maCursorPos);
 mpRangeManagerTable-SetSelectHdl( LINK( this, ScNameDlg, 
SelectionChangedHdl_Impl ) );
 mpRangeManagerTable-SetDeselectHdl( LINK( this, ScNameDlg, 
SelectionChangedHdl_Impl ) );
 
diff --git a/sc/source/ui/namedlg/namemgrtable.cxx 
b/sc/source/ui/namedlg/namemgrtable.cxx
index 7f8eb6b..b9164d3

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

2012-01-06 Thread Kohei Yoshida 
 sc/source/core/data/document.cxx |   30 ++
 1 file changed, 18 insertions(+), 12 deletions(-)

New commits:
commit 225d19808800785e3f4ad2b9b8e37f5f9397cf15
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Fri Jan 6 20:56:20 2012 -0500

fdo#44467: Deleting sheets should adjust drawing object pages as well.

Good thing we caught this, because we were also leaking memory by not
deleting the deleted sheet instances.

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index eb03a74..15d5295 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -95,6 +95,7 @@
 #include externalrefmgr.hxx
 #include tabprotection.hxx
 #include clipparam.hxx
+#include stlalgorithm.hxx
 
 #include map
 #include limits
@@ -651,17 +652,19 @@ bool ScDocument::DeleteTab( SCTAB nTab, ScDocument* 
pRefUndoDoc )
 if ( pUnoBroadcaster )
 pUnoBroadcaster-Broadcast( ScUpdateRefHint( URM_INSDEL, 
aRange, 0,0,-1 ) );
 
-SCTAB i;
-for (i=0; i static_castSCTAB(maTabs.size()); i++)
+for (SCTAB i = 0, n = static_castSCTAB(maTabs.size()); i  
n; ++i)
 if (maTabs[i])
-maTabs[i]-UpdateDeleteTab(nTab,false,
-pRefUndoDoc ? pRefUndoDoc-maTabs[i] : 0);
-maTabs.erase(maTabs.begin()+ nTab);
+maTabs[i]-UpdateDeleteTab(
+nTab, false, pRefUndoDoc ? pRefUndoDoc-maTabs[i] 
: 0);
+
+TableContainer::iterator it = maTabs.begin() + nTab;
+delete *it;
+maTabs.erase(it);
 // UpdateBroadcastAreas must be called between UpdateDeleteTab,
 // which ends listening, and StartAllListeners, to not modify
 // areas that are to be inserted by starting listeners.
 UpdateBroadcastAreas( URM_INSDEL, aRange, 0,0,-1);
-TableContainer::iterator it = maTabs.begin();
+it = maTabs.begin();
 for (; it != maTabs.end(); ++it)
 if ( *it )
 (*it)-UpdateCompile();
@@ -738,17 +741,20 @@ bool ScDocument::DeleteTabs( SCTAB nTab, SCTAB nSheets, 
ScDocument* pRefUndoDoc
 if ( pUnoBroadcaster )
 pUnoBroadcaster-Broadcast( ScUpdateRefHint( URM_INSDEL, 
aRange, 0,0,-1*nSheets ) );
 
-SCTAB i;
-for (i=0; i static_castSCTAB(maTabs.size()); i++)
+for (SCTAB i = 0, n = static_castSCTAB(maTabs.size()); i  
n; ++i)
 if (maTabs[i])
-maTabs[i]-UpdateDeleteTab(nTab,false,
-pRefUndoDoc ? pRefUndoDoc-maTabs[i] : 
0,nSheets);
-maTabs.erase(maTabs.begin()+ nTab, maTabs.begin() + nTab + 
nSheets);
+maTabs[i]-UpdateDeleteTab(
+nTab, false, pRefUndoDoc ? pRefUndoDoc-maTabs[i] 
: 0,nSheets);
+
+TableContainer::iterator it = maTabs.begin() + nTab;
+TableContainer::iterator itEnd = it + nSheets;
+std::for_each(it, itEnd, ScDeleteObjectByPtrScTable());
+maTabs.erase(it, itEnd);
 // UpdateBroadcastAreas must be called between UpdateDeleteTab,
 // which ends listening, and StartAllListeners, to not modify
 // areas that are to be inserted by starting listeners.
 UpdateBroadcastAreas( URM_INSDEL, aRange, 0,0,-1*nSheets);
-TableContainer::iterator it = maTabs.begin();
+it = maTabs.begin();
 for (; it != maTabs.end(); ++it)
 if ( *it )
 (*it)-UpdateCompile();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

2012-01-06 Thread Kohei Yoshida 
 sc/source/core/data/document.cxx |   30 ++
 1 file changed, 18 insertions(+), 12 deletions(-)

New commits:
commit f60c1cd239da3e2fcb30f4af8761013c8ae9c0fc
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Fri Jan 6 20:56:20 2012 -0500

fdo#44467: Deleting sheets should adjust drawing object pages as well.

Good thing we caught this, because we were also leaking memory by not
deleting the deleted sheet instances.

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index eb03a74..15d5295 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -95,6 +95,7 @@
 #include externalrefmgr.hxx
 #include tabprotection.hxx
 #include clipparam.hxx
+#include stlalgorithm.hxx
 
 #include map
 #include limits
@@ -651,17 +652,19 @@ bool ScDocument::DeleteTab( SCTAB nTab, ScDocument* 
pRefUndoDoc )
 if ( pUnoBroadcaster )
 pUnoBroadcaster-Broadcast( ScUpdateRefHint( URM_INSDEL, 
aRange, 0,0,-1 ) );
 
-SCTAB i;
-for (i=0; i static_castSCTAB(maTabs.size()); i++)
+for (SCTAB i = 0, n = static_castSCTAB(maTabs.size()); i  
n; ++i)
 if (maTabs[i])
-maTabs[i]-UpdateDeleteTab(nTab,false,
-pRefUndoDoc ? pRefUndoDoc-maTabs[i] : 0);
-maTabs.erase(maTabs.begin()+ nTab);
+maTabs[i]-UpdateDeleteTab(
+nTab, false, pRefUndoDoc ? pRefUndoDoc-maTabs[i] 
: 0);
+
+TableContainer::iterator it = maTabs.begin() + nTab;
+delete *it;
+maTabs.erase(it);
 // UpdateBroadcastAreas must be called between UpdateDeleteTab,
 // which ends listening, and StartAllListeners, to not modify
 // areas that are to be inserted by starting listeners.
 UpdateBroadcastAreas( URM_INSDEL, aRange, 0,0,-1);
-TableContainer::iterator it = maTabs.begin();
+it = maTabs.begin();
 for (; it != maTabs.end(); ++it)
 if ( *it )
 (*it)-UpdateCompile();
@@ -738,17 +741,20 @@ bool ScDocument::DeleteTabs( SCTAB nTab, SCTAB nSheets, 
ScDocument* pRefUndoDoc
 if ( pUnoBroadcaster )
 pUnoBroadcaster-Broadcast( ScUpdateRefHint( URM_INSDEL, 
aRange, 0,0,-1*nSheets ) );
 
-SCTAB i;
-for (i=0; i static_castSCTAB(maTabs.size()); i++)
+for (SCTAB i = 0, n = static_castSCTAB(maTabs.size()); i  
n; ++i)
 if (maTabs[i])
-maTabs[i]-UpdateDeleteTab(nTab,false,
-pRefUndoDoc ? pRefUndoDoc-maTabs[i] : 
0,nSheets);
-maTabs.erase(maTabs.begin()+ nTab, maTabs.begin() + nTab + 
nSheets);
+maTabs[i]-UpdateDeleteTab(
+nTab, false, pRefUndoDoc ? pRefUndoDoc-maTabs[i] 
: 0,nSheets);
+
+TableContainer::iterator it = maTabs.begin() + nTab;
+TableContainer::iterator itEnd = it + nSheets;
+std::for_each(it, itEnd, ScDeleteObjectByPtrScTable());
+maTabs.erase(it, itEnd);
 // UpdateBroadcastAreas must be called between UpdateDeleteTab,
 // which ends listening, and StartAllListeners, to not modify
 // areas that are to be inserted by starting listeners.
 UpdateBroadcastAreas( URM_INSDEL, aRange, 0,0,-1*nSheets);
-TableContainer::iterator it = maTabs.begin();
+it = maTabs.begin();
 for (; it != maTabs.end(); ++it)
 if ( *it )
 (*it)-UpdateCompile();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-01-06 Thread Kohei Yoshida 
 sc/source/core/tool/interpr1.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 9199fedb8e20133782a081ac1c33a67d06dffbc6
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Fri Jan 6 22:19:16 2012 -0500

fdo#36387: Get external references to work with AND and OR.

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index a76d2b6..dcdc5fe 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -1246,6 +1246,8 @@ void ScInterpreter::ScAnd()
 }
 }
 break;
+case svExternalSingleRef:
+case svExternalDoubleRef:
 case svMatrix:
 {
 ScMatrixRef pMat = GetMatrix();
@@ -1344,6 +1346,8 @@ void ScInterpreter::ScOr()
 }
 }
 break;
+case svExternalSingleRef:
+case svExternalDoubleRef:
 case svMatrix:
 {
 bHaveValue = true;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

2012-01-06 Thread Kohei Yoshida 
 sc/source/core/tool/interpr1.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 8bf08458ff38e312773bc79a32e9f7a6d2f4197d
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Fri Jan 6 22:19:16 2012 -0500

fdo#36387: Get external references to work with AND and OR.

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index a76d2b6..dcdc5fe 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -1246,6 +1246,8 @@ void ScInterpreter::ScAnd()
 }
 }
 break;
+case svExternalSingleRef:
+case svExternalDoubleRef:
 case svMatrix:
 {
 ScMatrixRef pMat = GetMatrix();
@@ -1344,6 +1346,8 @@ void ScInterpreter::ScOr()
 }
 }
 break;
+case svExternalSingleRef:
+case svExternalDoubleRef:
 case svMatrix:
 {
 bHaveValue = true;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - sw/source

2012-01-06 Thread Jan Holesovsky 
 sw/source/ui/docvw/HeaderFooterWin.cxx |   14 +++-
 sw/source/ui/docvw/PageBreakWin.cxx|  108 ++---
 sw/source/ui/inc/HeaderFooterWin.hxx   |1 
 sw/source/ui/inc/PageBreakWin.hxx  |3 
 4 files changed, 37 insertions(+), 89 deletions(-)

New commits:
commit 60c968e9a2ef14aa289e677bd7f40d2c4724fd12
Author: Jan Holesovsky ke...@suse.cz
Date:   Sat Jan 7 04:27:25 2012 +0100

Page Breaks: IsLeaveWindow() is unreliable, we do not need it here.

diff --git a/sw/source/ui/docvw/PageBreakWin.cxx 
b/sw/source/ui/docvw/PageBreakWin.cxx
index 0edeb61..ff5050b 100644
--- a/sw/source/ui/docvw/PageBreakWin.cxx
+++ b/sw/source/ui/docvw/PageBreakWin.cxx
@@ -83,17 +83,11 @@ namespace
 
 void SwBreakDashedLine::MouseMove( const MouseEvent rMEvt )
 {
-if ( rMEvt.IsLeaveWindow() )
-{
-// don't fade if we just move to the 'button'
-Point aEventPos( GetPosPixel() + rMEvt.GetPosPixel() );
-if ( !m_pWin-Contains( aEventPos ) )
-m_pWin-Fade( false );
-}
+Point aEventPos( GetPosPixel() + rMEvt.GetPosPixel() );
+if ( !m_pWin-Contains( aEventPos ) )
+m_pWin-Fade( false );
 else if ( !m_pWin-IsVisible() )
-{
 m_pWin-Fade( true );
-}
 
 if ( !rMEvt.IsSynthetic() )
 {
@@ -309,13 +303,9 @@ void SwPageBreakWin::Select( )
 
 void SwPageBreakWin::MouseMove( const MouseEvent rMEvt )
 {
-if ( rMEvt.IsLeaveWindow() )
-{
-// don't fade if we just move to the 'line', or the popup menu is open
-Point aEventPos( rMEvt.GetPosPixel() + rMEvt.GetPosPixel() );
-if ( !Contains( aEventPos )  !PopupMenu::IsInExecute() )
-Fade( false );
-}
+Point aEventPos( rMEvt.GetPosPixel() + rMEvt.GetPosPixel() );
+if ( !Contains( aEventPos )  !PopupMenu::IsInExecute() )
+Fade( false );
 else if ( !IsVisible() )
 Fade( true );
 }
commit aa3bfbe776bcefd7e7b143e6843315df6b2a5ecb
Author: Jan Holesovsky ke...@suse.cz
Date:   Sat Jan 7 04:16:44 2012 +0100

Header/Footer, Page Breaks: Delay appearing by 500ms.

The delay was a good idea, just the 1s was too long.

diff --git a/sw/source/ui/docvw/HeaderFooterWin.cxx 
b/sw/source/ui/docvw/HeaderFooterWin.cxx
index ff7d50e..330c1ff 100644
--- a/sw/source/ui/docvw/HeaderFooterWin.cxx
+++ b/sw/source/ui/docvw/HeaderFooterWin.cxx
@@ -153,6 +153,7 @@ SwHeaderFooterWin::SwHeaderFooterWin( SwEditWin* pEditWin, 
const SwPageFrm* pPag
 m_pLine( NULL ),
 m_bIsAppearing( false ),
 m_nFadeRate( 100 ),
+m_nDelayAppearing( 0 ),
 m_aFadeTimer( )
 {
 // Get the font and configure it
@@ -243,6 +244,9 @@ void SwHeaderFooterWin::ShowAll( bool bShow )
 if ( !PopupMenu::IsInExecute() )
 {
 m_bIsAppearing = bShow;
+if ( bShow )
+m_nDelayAppearing = 0;
+
 if ( m_aFadeTimer.IsActive( ) )
 m_aFadeTimer.Stop();
 m_aFadeTimer.Start( );
@@ -516,6 +520,14 @@ void SwHeaderFooterWin::Select( )
 
 IMPL_LINK( SwHeaderFooterWin, FadeHandler, Timer *, EMPTYARG )
 {
+const int TICKS_BEFORE_WE_APPEAR = 10;
+if ( m_bIsAppearing  m_nDelayAppearing  TICKS_BEFORE_WE_APPEAR )
+{
+++m_nDelayAppearing;
+m_aFadeTimer.Start();
+return 0;
+}
+
 if ( m_bIsAppearing  m_nFadeRate  0 )
 m_nFadeRate -= 25;
 else if ( !m_bIsAppearing  m_nFadeRate  100 )
@@ -535,7 +547,7 @@ IMPL_LINK( SwHeaderFooterWin, FadeHandler, Timer *, 
EMPTYARG )
 Invalidate();
 
 if ( IsVisible( )  m_nFadeRate  0  m_nFadeRate  100 )
-m_aFadeTimer.Start();
+m_aFadeTimer.Start();
 
 return 0;
 }
diff --git a/sw/source/ui/docvw/PageBreakWin.cxx 
b/sw/source/ui/docvw/PageBreakWin.cxx
index 0617101..0edeb61 100644
--- a/sw/source/ui/docvw/PageBreakWin.cxx
+++ b/sw/source/ui/docvw/PageBreakWin.cxx
@@ -110,6 +110,7 @@ SwPageBreakWin::SwPageBreakWin( SwEditWin* pEditWin, const 
SwPageFrm* pPageFrm )
 m_pLine( NULL ),
 m_bIsAppearing( false ),
 m_nFadeRate( 100 ),
+m_nDelayAppearing( 0 ),
 m_bDestroyed( false ),
 m_pMousePt( NULL )
 {
@@ -424,6 +425,9 @@ void SwPageBreakWin::SetReadonly( bool bReadonly )
 void SwPageBreakWin::Fade( bool bFadeIn )
 {
 m_bIsAppearing = bFadeIn;
+if ( bFadeIn )
+m_nDelayAppearing = 0;
+
 if ( !m_bDestroyed  m_aFadeTimer.IsActive( ) )
 m_aFadeTimer.Stop();
 if ( !m_bDestroyed )
@@ -439,6 +443,14 @@ IMPL_LINK( SwPageBreakWin, HideHandler, void *, EMPTYARG )
 
 IMPL_LINK( SwPageBreakWin, FadeHandler, Timer *, EMPTYARG )
 {
+const int TICKS_BEFORE_WE_APPEAR = 10;
+if ( m_bIsAppearing  m_nDelayAppearing  TICKS_BEFORE_WE_APPEAR )
+{
+++m_nDelayAppearing;
+m_aFadeTimer.Start();
+return 0;
+}
+
 if ( m_bIsAppearing  m_nFadeRate  0 )
 m_nFadeRate -= 25;
 else if ( !m_bIsAppearing  m_nFadeRate  100 )
diff --git

[Libreoffice-commits] .: sc/qa

2012-01-06 Thread Kohei Yoshida 
 sc/qa/unit/ucalc.cxx |  117 ++-
 1 file changed, 97 insertions(+), 20 deletions(-)

New commits:
commit f0c9362d9dca4bda4f3d87e181a2b59fcc08d7d2
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Fri Jan 6 23:59:40 2012 -0500

New unit test code for drawing objects.

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 5471c47..1adc2bf 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -65,6 +65,7 @@
 
 #include svx/svdograf.hxx
 #include svx/svdpage.hxx
+#include svx/svdocirc.hxx
 
 #include sfx2/docfile.hxx
 
@@ -151,6 +152,7 @@ public:
 void testFunctionLists();
 
 void testGraphicsInGroup();
+void testGraphicsOnSheetMove();
 
 void testPostIts();
 
@@ -186,6 +188,7 @@ public:
 CPPUNIT_TEST(testExternalRefFunctions);
 CPPUNIT_TEST(testDataArea);
 CPPUNIT_TEST(testGraphicsInGroup);
+CPPUNIT_TEST(testGraphicsOnSheetMove);
 CPPUNIT_TEST(testPostIts);
 CPPUNIT_TEST(testStreamValid);
 CPPUNIT_TEST(testFunctionLists);
@@ -2447,32 +2450,106 @@ void Test::testGraphicsInGroup()
 SdrPage* pPage = pDrawLayer-GetPage(0);
 CPPUNIT_ASSERT_MESSAGE(must have a draw page, pPage != NULL);
 
-//Add a square
-Rectangle aOrigRect(2,2,100,100);
-SdrRectObj *pObj = new SdrRectObj(aOrigRect);
-pPage-InsertObject(pObj);
-const Rectangle rNewRect = pObj-GetLogicRect();
-CPPUNIT_ASSERT_MESSAGE(must have equal position and size, aOrigRect == 
rNewRect);
+{
+//Add a square
+Rectangle aOrigRect(2,2,100,100);
+SdrRectObj *pObj = new SdrRectObj(aOrigRect);
+pPage-InsertObject(pObj);
+const Rectangle rNewRect = pObj-GetLogicRect();
+CPPUNIT_ASSERT_MESSAGE(must have equal position and size, aOrigRect 
== rNewRect);
+
+ScDrawLayer::SetPageAnchored(*pObj);
+
+//Use a range of rows guaranteed to include all of the square
+m_pDoc-ShowRows(0, 100, 0, false);
+CPPUNIT_ASSERT_MESSAGE(Should not change when page anchored, 
aOrigRect == rNewRect);
+m_pDoc-ShowRows(0, 100, 0, true);
+CPPUNIT_ASSERT_MESSAGE(Should not change when page anchored, 
aOrigRect == rNewRect);
+
+ScDrawLayer::SetCellAnchoredFromPosition(*pObj, *m_pDoc, 0);
+CPPUNIT_ASSERT_MESSAGE(That shouldn't change size or positioning, 
aOrigRect == rNewRect);
+
+m_pDoc-ShowRows(0, 100, 0, false);
+CPPUNIT_ASSERT_MESSAGE(Left and Right should be unchanged,
+aOrigRect.nLeft == rNewRect.nLeft  aOrigRect.nRight == 
rNewRect.nRight);
+CPPUNIT_ASSERT_MESSAGE(Height should be minimum allowed height,
+(rNewRect.nBottom - rNewRect.nTop) = 1);
+m_pDoc-ShowRows(0, 100, 0, true);
+CPPUNIT_ASSERT_MESSAGE(Should not change when page anchored, 
aOrigRect == rNewRect);
+}
 
-ScDrawLayer::SetPageAnchored(*pObj);
+{
+// Add a circle.
+Rectangle aOrigRect = Rectangle(10,10,210,210); // 200 x 200
+SdrCircObj* pObj = new SdrCircObj(OBJ_CIRC, aOrigRect);
+pPage-InsertObject(pObj);
+const Rectangle rNewRect = pObj-GetLogicRect();
+CPPUNIT_ASSERT_MESSAGE(Position and size of the circle shouldn't 
change when inserted into the page.,
+   aOrigRect == rNewRect);
+
+ScDrawLayer::SetCellAnchoredFromPosition(*pObj, *m_pDoc, 0);
+CPPUNIT_ASSERT_MESSAGE(Size changed when cell anchored. Not good.,
+   aOrigRect == rNewRect);
+
+// Insert 2 rows at the top.  This should push the circle object down.
+m_pDoc-InsertRow(0, 0, MAXCOL, 0, 0, 2);
+
+// Make sure the size of the circle is still identical.
+CPPUNIT_ASSERT_MESSAGE(Size of the circle has changed, but 
shouldn't!,
+   aOrigRect.GetSize() == rNewRect.GetSize());
+
+// Delete 2 rows at the top.  This should bring the circle object to 
its original position.
+m_pDoc-DeleteRow(0, 0, MAXCOL, 0, 0, 2);
+CPPUNIT_ASSERT_MESSAGE(Failed to move back to its original 
position., aOrigRect == rNewRect);
+}
 
-//Use a range of rows guaranteed to include all of the square
-m_pDoc-ShowRows(0, 100, 0, false);
-CPPUNIT_ASSERT_MESSAGE(Should not change when page anchored, aOrigRect 
== rNewRect);
-m_pDoc-ShowRows(0, 100, 0, true);
-CPPUNIT_ASSERT_MESSAGE(Should not change when page anchored, aOrigRect 
== rNewRect);
+m_pDoc-DeleteTab(0);
+}
 
+void Test::testGraphicsOnSheetMove()
+{
+m_pDoc-InsertTab(0, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Tab1)));
+m_pDoc-InsertTab(1, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Tab2)));
+CPPUNIT_ASSERT_MESSAGE(There should be only 2 sheets to begin with, 
m_pDoc-GetTableCount() == 2);
+
+m_pDoc-InitDrawLayer();
+ScDrawLayer* pDrawLayer = m_pDoc-GetDrawLayer();
+CPPUNIT_ASSERT_MESSAGE(No drawing layer., pDrawLayer);
+SdrPage* pPage =

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

2012-01-06 Thread Kohei Yoshida 
 sc/source/core/data/document.cxx |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit 34b8ee9b1cc7657fbdcad36cd29971038d2c6e6c
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Sat Jan 7 00:14:35 2012 -0500

Removing debug statements.

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 15d5295..61fdbe5 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -100,9 +100,6 @@
 #include map
 #include limits
 
-#include rtl/oustringostreaminserter.hxx
-#include iostream
-
 using ::editeng::SvxBorderLine;
 using namespace ::com::sun::star;
 
@@ -1729,11 +1726,7 @@ void ScDocument::InitUndo( ScDocument* pSrcDoc, SCTAB 
nTab1, SCTAB nTab2,
 
 xPoolHelper = pSrcDoc-xPoolHelper;
 if (pSrcDoc-pShell-GetMedium())
-{
 maFileURL = 
pSrcDoc-pShell-GetMedium()-GetURLObject().GetMainURL(INetURLObject::DECODE_TO_IURI);
-std::cout  SfxMedium:   maFileURL  std::endl;
-std::cout  GetName:   
rtl::OUString(pSrcDoc-pShell-GetName())  std::endl;
-}
 
 rtl::OUString aString;
 if ( nTab2 = static_castSCTAB(maTabs.size()))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

2012-01-06 Thread Kohei Yoshida 
 sc/source/core/data/document.cxx |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit d74c77428deba9619c678a59d6442ec281385264
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Sat Jan 7 00:14:35 2012 -0500

Removing debug statements.

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 15d5295..61fdbe5 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -100,9 +100,6 @@
 #include map
 #include limits
 
-#include rtl/oustringostreaminserter.hxx
-#include iostream
-
 using ::editeng::SvxBorderLine;
 using namespace ::com::sun::star;
 
@@ -1729,11 +1726,7 @@ void ScDocument::InitUndo( ScDocument* pSrcDoc, SCTAB 
nTab1, SCTAB nTab2,
 
 xPoolHelper = pSrcDoc-xPoolHelper;
 if (pSrcDoc-pShell-GetMedium())
-{
 maFileURL = 
pSrcDoc-pShell-GetMedium()-GetURLObject().GetMainURL(INetURLObject::DECODE_TO_IURI);
-std::cout  SfxMedium:   maFileURL  std::endl;
-std::cout  GetName:   
rtl::OUString(pSrcDoc-pShell-GetName())  std::endl;
-}
 
 rtl::OUString aString;
 if ( nTab2 = static_castSCTAB(maTabs.size()))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source toolkit/source ucb/source ucb/workben unodevtools/source

2012-01-06 Thread Takeshi Abe 
 sw/source/core/edit/edundo.cxx   |6 +-
 sw/source/core/tox/toxhlp.cxx|   12 ++---
 sw/source/core/unocore/unoparagraph.cxx  |4 -
 sw/source/core/unocore/unoport.cxx   |6 +-
 sw/source/core/unocore/unorefmk.cxx  |2 
 sw/source/core/unocore/unosect.cxx   |2 
 sw/source/core/unocore/unostyle.cxx  |4 -
 sw/source/filter/xml/swxml.cxx   |   10 ++--
 toolkit/source/awt/vclxtoolkit.cxx   |8 +--
 toolkit/source/controls/tree/treecontrol.cxx |8 +--
 ucb/source/ucp/expand/ucpexpand.cxx  |2 
 ucb/source/ucp/webdav/DAVResourceAccess.cxx  |   40 +--
 ucb/source/ucp/webdav/DAVResourceAccess.hxx  |2 
 ucb/workben/ucb/ucbdemo.cxx  |4 -
 unodevtools/source/skeletonmaker/cppcompskeleton.cxx |4 -
 15 files changed, 57 insertions(+), 57 deletions(-)

New commits:
commit e4ce7225dd987f9b2f250f055d9688de79931444
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Sat Jan 7 15:50:41 2012 +0900

catch exception by constant reference

diff --git a/sw/source/core/edit/edundo.cxx b/sw/source/core/edit/edundo.cxx
index 7b2ae83..95c9252 100644
--- a/sw/source/core/edit/edundo.cxx
+++ b/sw/source/core/edit/edundo.cxx
@@ -136,7 +136,7 @@ bool SwEditShell::Undo(sal_uInt16 const nCount)
 bRet = GetDoc()-GetIDocumentUndoRedo().Undo()
 || bRet;
 }
-} catch (::com::sun::star::uno::Exception  e) {
+} catch (const ::com::sun::star::uno::Exception  e) {
 OSL_TRACE(SwEditShell::Undo(): exception caught:\n %s,
 ::rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8)
 .getStr());
@@ -187,7 +187,7 @@ bool SwEditShell::Redo(sal_uInt16 const nCount)
 bRet = GetDoc()-GetIDocumentUndoRedo().Redo()
 || bRet;
 }
-} catch (::com::sun::star::uno::Exception  e) {
+} catch (const ::com::sun::star::uno::Exception  e) {
 OSL_TRACE(SwEditShell::Redo(): exception caught:\n %s,
 ::rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8)
 .getStr());
@@ -217,7 +217,7 @@ bool SwEditShell::Repeat(sal_uInt16 const nCount)
 ::sw::RepeatContext context(*GetDoc(), *GetCrsr());
 bRet = GetDoc()-GetIDocumentUndoRedo().Repeat( context, nCount )
 || bRet;
-} catch (::com::sun::star::uno::Exception  e) {
+} catch (const ::com::sun::star::uno::Exception  e) {
 OSL_TRACE(SwEditShell::Repeat(): exception caught:\n %s,
 ::rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8)
 .getStr());
diff --git a/sw/source/core/tox/toxhlp.cxx b/sw/source/core/tox/toxhlp.cxx
index 95e5a20..f1ae986 100644
--- a/sw/source/core/tox/toxhlp.cxx
+++ b/sw/source/core/tox/toxhlp.cxx
@@ -55,7 +55,7 @@ IndexEntrySupplierWrapper::IndexEntrySupplierWrapper()
 x = xIES;
 }
 }
-catch ( UNO_NMSPC::Exception
+catch (const UNO_NMSPC::Exception
 #if OSL_DEBUG_LEVEL  0
 e
 #endif
@@ -81,7 +81,7 @@ String IndexEntrySupplierWrapper::GetIndexKey( const String 
rTxt,
 try {
 sRet = xIES-getIndexKey( rTxt, rTxtReading, rLocale );
 }
-catch ( UNO_NMSPC::Exception
+catch (const UNO_NMSPC::Exception
 #if OSL_DEBUG_LEVEL  0
 e
 #endif
@@ -102,7 +102,7 @@ String IndexEntrySupplierWrapper::GetFollowingText( 
sal_Bool bMorePages ) const
 try {
 sRet = xIES-getIndexFollowPageWord( bMorePages, aLcl );
 }
-catch ( UNO_NMSPC::Exception
+catch (const UNO_NMSPC::Exception
 #if OSL_DEBUG_LEVEL  0
 e
 #endif
@@ -125,7 +125,7 @@ IndexEntrySupplierWrapper::GetAlgorithmList( const 
STAR_NMSPC::lang::Locale rLc
 try {
 sRet = xIES-getAlgorithmList( rLcl );
 }
-catch ( UNO_NMSPC::Exception
+catch (const UNO_NMSPC::Exception
 #if OSL_DEBUG_LEVEL  0
 e
 #endif
@@ -148,7 +148,7 @@ sal_Bool IndexEntrySupplierWrapper::LoadAlgorithm(
 try {
 bRet = xIES-loadAlgorithm( rLcl, sSortAlgorithm, nOptions );
 }
-catch ( UNO_NMSPC::Exception
+catch (const UNO_NMSPC::Exception
 #if OSL_DEBUG_LEVEL  0
 e
 #endif
@@ -174,7 +174,7 @@ sal_Int16 IndexEntrySupplierWrapper::CompareIndexEntry(
 nRet = xIES-compareIndexEntry( rTxt1, rTxtReading1, rLocale1,
 rTxt2, rTxtReading2, rLocale2 );
 }
-catch ( UNO_NMSPC::Exception
+catch (const UNO_NMSPC::Exception
 #if OSL_DEBUG_LEVEL  0
 e
 #endif
diff --git a/sw/source/core/unocore/unoparagraph.cxx 
b/sw/source/core/unocore/unoparagraph.cxx
index 930eaf9..0f8a412 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -432,7 +432,7 @@ throw