[Libreoffice-commits] .: extensions/Executable_pluginapp.bin.mk
extensions/Executable_pluginapp.bin.mk |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit c3fdb4973bae6a169f7b4f745f613320b18ea2b4 Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Jan 7 12:54:16 2012 +0100 add gthread external here diff --git a/extensions/Executable_pluginapp.bin.mk b/extensions/Executable_pluginapp.bin.mk index 1c3b4fc..50b606c 100644 --- a/extensions/Executable_pluginapp.bin.mk +++ b/extensions/Executable_pluginapp.bin.mk @@ -85,7 +85,10 @@ endif ifeq ($(ENABLE_GTK),TRUE) -$(eval $(call gb_Executable_use_external,pluginapp.bin,gtk)) +$(eval $(call gb_Executable_use_externals,pluginapp.bin,\ +gthread \ +gtk \ +)) # the orignal dmakefile said: don't ask, it's ugly ifeq ($(OS),SOLARIS) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - fpicker/Executable_kdefilepicker.mk fpicker/Library_fps_kde4.mk fpicker/Module_fpicker.mk fpicker/Package_kde4_moc.mk fpicker/Package_kde_moc.mk fpicker/source
fpicker/Executable_kdefilepicker.mk |8 ++--- fpicker/Library_fps_kde4.mk |8 ++--- fpicker/Module_fpicker.mk | 52 ++-- fpicker/Package_kde4_moc.mk | 36 fpicker/Package_kde_moc.mk | 36 fpicker/source/unx/kde/Makefile | 35 fpicker/source/unx/kde4/Makefile| 35 7 files changed, 183 insertions(+), 27 deletions(-) New commits: commit e99464ea0f8aec2d015b3136b84a3b26e2bcda52 Author: David Tardon dtar...@redhat.com Date: Sat Jan 7 15:22:39 2012 +0100 use custom target for generated source diff --git a/fpicker/Executable_kdefilepicker.mk b/fpicker/Executable_kdefilepicker.mk index 1352efd..036e59a 100644 --- a/fpicker/Executable_kdefilepicker.mk +++ b/fpicker/Executable_kdefilepicker.mk @@ -27,6 +27,10 @@ $(eval $(call gb_Executable_Executable,kdefilepicker)) +$(eval $(call gb_Executable_add_package_headers,kdefilepicker,\ + fpicker_kde_moc \ +)) + $(eval $(call gb_Executable_add_defs,kdefilepicker,\ $(KDE_CFLAGS) \ )) @@ -52,8 +56,4 @@ $(eval $(call gb_Executable_add_generated_cxxobjects,kdefilepicker,\ CustomTarget/fpicker/source/unx/kde/kdefilepicker.moc \ )) -$(WORKDIR)/CustomTarget/fpicker/source/unx/kde/kdefilepicker.moc.cxx : $(SRCDIR)/fpicker/source/unx/kde/kdefilepicker.hxx - mkdir -p $(dir $@) - $(MOC) $ -o $@ - # vim: set noet sw=4 ts=4: diff --git a/fpicker/Module_fpicker.mk b/fpicker/Module_fpicker.mk index 2682802..1f0696f 100644 --- a/fpicker/Module_fpicker.mk +++ b/fpicker/Module_fpicker.mk @@ -56,6 +56,7 @@ ifeq ($(ENABLE_KDE),TRUE) $(eval $(call gb_Module_add_targets,fpicker,\ Executable_kdefilepicker \ Library_fps_kde \ + Package_kde_moc \ )) endif diff --git a/fpicker/Package_kde_moc.mk b/fpicker/Package_kde_moc.mk new file mode 100644 index 000..1350937 --- /dev/null +++ b/fpicker/Package_kde_moc.mk @@ -0,0 +1,36 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the License); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an AS IS basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2010 Red Hat, Inc., David Tardon dtar...@redhat.com +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the GPLv3+), or +# the GNU Lesser General Public License Version 3 or later (the LGPLv3+), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Package_Package,fpicker_kde_moc,$(WORKDIR)/CustomTarget/fpicker/source/unx/kde)) + +$(eval $(call gb_Package_add_customtarget,fpicker_kde_moc,fpicker/source/unx/kde)) + +$(eval $(call gb_CustomTarget_add_dependencies,fpicker/source/unx/kde,\ +fpicker/source/unx/kde/kdefilepicker.hxx \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/fpicker/source/unx/kde/Makefile b/fpicker/source/unx/kde/Makefile new file mode 100644 index 000..445c446 --- /dev/null +++ b/fpicker/source/unx/kde/Makefile @@ -0,0 +1,35 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the License); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an AS IS basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2010 Red Hat, Inc., David Tardon dtar...@redhat.com +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the GPLv3+), or +# the GNU Lesser General Public License Version 3 or later (the LGPLv3+), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +kdefilepicker.moc.cxx : + $(MOC) -o $@
[Libreoffice-commits] .: cui/source
cui/source/options/optdict.src |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit bcaa334ad6cba9b339a72bfdf9d5e74a7773cacd
Author: Ivan Timofeev timofeev@gmail.com
Date: Sat Jan 7 09:29:29 2012 +0400
move overlapped controls
diff --git a/cui/source/options/optdict.src b/cui/source/options/optdict.src
index 31a8f9a..009aa34 100644
--- a/cui/source/options/optdict.src
+++ b/cui/source/options/optdict.src
@@ -122,8 +122,8 @@ ModalDialog RID_SFXDLG_EDITDICT
{
HelpID = cui:ListBox:RID_SFXDLG_EDITDICT:LB_ALLDICTS;
Border = TRUE ;
-Pos = MAP_APPFONT ( 82 , 9 ) ;
-Size = MAP_APPFONT ( 121 , 62 ) ;
+Pos = MAP_APPFONT ( 100 , 9 ) ;
+Size = MAP_APPFONT ( 103 , 62 ) ;
DropDown = TRUE ;
};
FixedText FT_DICTLANG
@@ -136,8 +136,8 @@ ModalDialog RID_SFXDLG_EDITDICT
{
HelpID = cui:ListBox:RID_SFXDLG_EDITDICT:LB_DICTLANG;
Border = TRUE ;
-Pos = MAP_APPFONT ( 82 , 25 ) ;
-Size = MAP_APPFONT ( 121 , 66 ) ;
+Pos = MAP_APPFONT ( 100 , 25 ) ;
+Size = MAP_APPFONT ( 103 , 66 ) ;
DropDown = TRUE ;
};
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - cui/source
cui/source/options/optdict.src |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 5907a4c1b8af1f73e966b4c1fe517dee0a3815f1
Author: Ivan Timofeev timofeev@gmail.com
Date: Sat Jan 7 09:29:29 2012 +0400
move overlapped controls
diff --git a/cui/source/options/optdict.src b/cui/source/options/optdict.src
index 31a8f9a..009aa34 100644
--- a/cui/source/options/optdict.src
+++ b/cui/source/options/optdict.src
@@ -122,8 +122,8 @@ ModalDialog RID_SFXDLG_EDITDICT
{
HelpID = cui:ListBox:RID_SFXDLG_EDITDICT:LB_ALLDICTS;
Border = TRUE ;
-Pos = MAP_APPFONT ( 82 , 9 ) ;
-Size = MAP_APPFONT ( 121 , 62 ) ;
+Pos = MAP_APPFONT ( 100 , 9 ) ;
+Size = MAP_APPFONT ( 103 , 62 ) ;
DropDown = TRUE ;
};
FixedText FT_DICTLANG
@@ -136,8 +136,8 @@ ModalDialog RID_SFXDLG_EDITDICT
{
HelpID = cui:ListBox:RID_SFXDLG_EDITDICT:LB_DICTLANG;
Border = TRUE ;
-Pos = MAP_APPFONT ( 82 , 25 ) ;
-Size = MAP_APPFONT ( 121 , 66 ) ;
+Pos = MAP_APPFONT ( 100 , 25 ) ;
+Size = MAP_APPFONT ( 103 , 66 ) ;
DropDown = TRUE ;
};
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 948f57e74dda7e64b7c72208eaec00eac1bb96ba
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Jan 7 17:48:13 2012 +0100
Fix fdo#44065
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
index 9ef1314..e15da07 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
@@ -118,7 +118,7 @@ namespace connectivity { namespace mozab {
{ WebPage2, homeurl,
DEF_CARD_ACCESS( WebPage2 ) },
{ BirthYear, birthyear,
DEF_CARD_ACCESS( BirthYear ) },
{ BirthMonth, birthmonth,
DEF_CARD_ACCESS( BirthMonth ) },
-{ BirthYear, birthday,
DEF_CARD_ACCESS( BirthDay ) },
+{ BirthDay, birthday,
DEF_CARD_ACCESS( BirthDay ) },
{ Custom1,custom1,
DEF_CARD_ACCESS( Custom1 ) },
{ Custom2,custom2,
DEF_CARD_ACCESS( Custom2 ) },
{ Custom3,custom3,
DEF_CARD_ACCESS( Custom3 ) },
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: chart2/source dbaccess/source extensions/source sc/source svl/inc svl/source svx/source sw/source xmloff/source
chart2/source/controller/dialogs/DataBrowser.cxx |3 --- chart2/source/controller/dialogs/dlg_ObjectProperties.cxx |3 --- chart2/source/controller/dialogs/tp_AxisPositions.cxx |3 --- chart2/source/controller/dialogs/tp_Scale.cxx |3 --- dbaccess/source/ui/browser/sbagrid.cxx|1 - dbaccess/source/ui/control/FieldDescControl.cxx |1 - dbaccess/source/ui/dlg/dlgattr.cxx|1 - dbaccess/source/ui/misc/UITools.cxx |2 -- extensions/source/propctrlr/usercontrol.hxx |1 - sc/source/core/data/documen2.cxx |1 - sc/source/core/data/documen8.cxx |1 - sc/source/core/data/document.cxx |1 - sc/source/core/inc/core_pch.hxx |2 -- sc/source/filter/inc/filt_pch.hxx |2 -- sc/source/ui/inc/ui_pch.hxx |2 -- sc/source/ui/view/cellsh1.cxx |1 - sc/source/ui/view/formatsh.cxx|1 - sc/source/ui/view/tabvwsh5.cxx|1 - sc/source/ui/view/tabvwsha.cxx|1 - svl/inc/svl/zforlist.hxx |6 -- svl/source/numbers/numuno.cxx |2 -- svx/source/items/numfmtsh.cxx |1 - sw/source/core/doc/docfmt.cxx |1 - sw/source/core/doc/tblcpy.cxx |1 - sw/source/core/doc/tblrwcl.cxx|1 - sw/source/core/docnode/ndcopy.cxx |1 - sw/source/ui/shells/tabsh.cxx |1 - sw/source/ui/utlui/numfmtlb.cxx |1 - xmloff/source/style/xmlnumfe.cxx |1 - xmloff/source/style/xmlnumfi.cxx |1 - 30 files changed, 48 deletions(-) New commits: commit 5b031b4ea68df5ca210a5631c801414b476d8094 Author: Marcel Metz mm...@adrian-broher.net Date: Sat Jan 7 22:14:05 2012 +0400 Remove superfluous _ZFORLIST_DECLARE_TABLE definition. diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 5de9287..182a36f 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -29,9 +29,6 @@ // header for class SvNumberformat #ifndef _ZFORMAT_HXX -#ifndef _ZFORLIST_DECLARE_TABLE -#define _ZFORLIST_DECLARE_TABLE -#endif #include svl/zformat.hxx #endif // header for SvNumberFormatter diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index ba13051..e3a6d22 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -27,9 +27,6 @@ / #ifndef _ZFORLIST_HXX -#ifndef _ZFORLIST_DECLARE_TABLE -#define _ZFORLIST_DECLARE_TABLE -#endif #include svl/zforlist.hxx #endif diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx index 8632c4a..b51b303 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx @@ -49,9 +49,6 @@ // header for class SvNumberformat #ifndef _ZFORMAT_HXX -#ifndef _ZFORLIST_DECLARE_TABLE -#define _ZFORLIST_DECLARE_TABLE -#endif #include svl/zformat.hxx #endif diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index 39ce58b..fd456ff 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -49,9 +49,6 @@ // header for class SvNumberformat #ifndef _ZFORMAT_HXX -#ifndef _ZFORLIST_DECLARE_TABLE -#define _ZFORLIST_DECLARE_TABLE -#endif #include svl/zformat.hxx #endif diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 7ba5def..6fc1751 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -38,7 +38,6 @@ #define ITEMID_NUMBERINFO SID_ATTR_NUMBERFORMAT_INFO -#define _ZFORLIST_DECLARE_TABLE #include svx/numinf.hxx #include svx/dbaexchange.hxx #include com/sun/star/ui/dialogs/XExecutableDialog.hpp diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index ecdd3b8..c100d9d 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -48,7 +48,6 @@ #include svx/svxids.hrc #include svx/algitem.hxx #include svl/itempool.hxx -#define
[Libreoffice-commits] .: unodevtools/source unotools/source unoxml/source vcl/aqua vcl/ios vcl/source vcl/unx vcl/workben
unodevtools/source/skeletonmaker/cppcompskeleton.cxx |6 +++---
unodevtools/source/skeletonmaker/javacompskeleton.cxx |2 +-
unodevtools/source/skeletonmaker/skeletonmaker.cxx|4 ++--
unotools/source/config/confignode.cxx |3 +--
unotools/source/config/itemholder1.cxx|2 +-
unotools/source/i18n/collatorwrapper.cxx | 12
unotools/source/i18n/localedatawrapper.cxx|4 ++--
unotools/source/i18n/nativenumberwrapper.cxx | 12
unotools/source/i18n/numberformatcodewrapper.cxx | 12
unotools/source/i18n/transliterationwrapper.cxx |6 +++---
unotools/source/ucbhelper/ucblockbytes.cxx|2 +-
unoxml/source/dom/documentbuilder.cxx |4 ++--
unoxml/source/dom/elementlist.cxx |2 +-
unoxml/source/rdf/librdf_repository.cxx | 14 +++---
vcl/aqua/source/gdi/salbmp.cxx|2 +-
vcl/ios/source/gdi/salbmp.cxx |2 +-
vcl/source/gdi/impimagetree.cxx |4 ++--
vcl/source/glyphs/graphite_layout.cxx |2 +-
vcl/unx/gtk/gdi/salprn-gtk.cxx|2 +-
vcl/workben/svpclient.cxx |2 +-
20 files changed, 43 insertions(+), 56 deletions(-)
New commits:
commit ff580eb39b46646309feba447f6bf485124db6b1
Author: Takeshi Abe t...@fixedpoint.jp
Date: Sun Jan 8 03:34:57 2012 +0900
catch exception by constant reference
diff --git a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
index 648efa6..97ba560 100644
--- a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
+++ b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
@@ -333,7 +333,7 @@ void generateXAddInBodies(std::ostream o, const OString
classname)
::rtl::OUString(),\n
sDISPLAYNAME);\nif (sDisplayName.equals(aDisplayName))\n
return functions[i];\n}\n}\n
- catch ( css::uno::RuntimeException e ) {\nthrow e;\n
}\n
+ catch ( const css::uno::RuntimeException e ) {\nthrow
e;\n}\n
catch ( css::uno::Exception ) {\n}\nreturn
ret;\n}\n\n;
o ::rtl::OUString SAL_CALL classname
getDisplayFunctionName(const
@@ -406,7 +406,7 @@ void generateXCompatibilityNamesBodies(std::ostream o,
const OString classnam
} while ( nIndex = 0 );\n\n
seqLocalizedNames[i].Locale = aLocale;\n
seqLocalizedNames[i].Name = sCompatibilityName;\n}
-\n}\n}\ncatch ( css::uno::RuntimeException e ) {\n
+\n}\n}\ncatch ( const css::uno::RuntimeException e
) {\n
throw e;\n}\ncatch ( css::uno::Exception ) {\n}\n\n
return seqLocalizedNames;\n}\n\n;
}
@@ -580,7 +580,7 @@ void generateAddinConstructorAndHelper(std::ostream o,
buf.makeStringAndClear()),
css::uno::UNO_QUERY);\n
xPropSet-getPropertyValue(\n
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(propName))) =
ret;\n}\n
- catch ( css::uno::RuntimeException e ) {\nthrow
e;\n}\n
+ catch ( const css::uno::RuntimeException e ) {\n
throw e;\n}\n
catch ( css::uno::Exception ) {\n}\nreturn ret;\n;
}
o }\n\n;
diff --git a/unodevtools/source/skeletonmaker/javacompskeleton.cxx
b/unodevtools/source/skeletonmaker/javacompskeleton.cxx
index ba8851c..1b71276 100644
--- a/unodevtools/source/skeletonmaker/javacompskeleton.cxx
+++ b/unodevtools/source/skeletonmaker/javacompskeleton.cxx
@@ -975,7 +975,7 @@ void generateSkeleton(ProgramOptions const options,
delete pofs;
OSL_VERIFY(makeValidTypeFile(compFileName, tmpFileName,
sal_False));
}
-} catch(CannotDumpException e) {
+} catch(const CannotDumpException e) {
std::cerr ERROR: e.m_message.getStr() \n;
if ( !standardout ) {
diff --git a/unodevtools/source/skeletonmaker/skeletonmaker.cxx
b/unodevtools/source/skeletonmaker/skeletonmaker.cxx
index ddd2ab4..119b778 100644
--- a/unodevtools/source/skeletonmaker/skeletonmaker.cxx
+++ b/unodevtools/source/skeletonmaker/skeletonmaker.cxx
@@ -338,10 +338,10 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, /*argv*/)
}
}
-} catch (CannotDumpException e) {
+} catch (const CannotDumpException e) {
std::cout.flush();
std::cerr \nError: e.m_message std::endl;
-} catch(Exception e) {
+} catch(const Exception e) {
std::cout.flush();
std::cerr
\nError:
diff --git
[Libreoffice-commits] .: sc/source
sc/source/ui/app/inputhdl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f8708acc5b72a0e453a42c19c396ccd4f7786da7
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sat Jan 7 17:55:49 2012 +0100
another missing null pointer check in multilinebar, fdo#44518
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 83b58ff..34959e1 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -2115,7 +2115,7 @@ void ScInputHandler::DataChanged( sal_Bool bFromTopNotify
)
if (eMode==SC_INPUT_TYPE || eMode==SC_INPUT_TABLE)
{
String aText;
-if ( pInputWin-IsMultiLineInput() )
+if ( pInputWin pInputWin-IsMultiLineInput() )
aText = ScEditUtil::GetMultilineString(*pEngine);
else
aText = GetEditText(pEngine);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - svx/source
svx/source/items/pageitem.cxx | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
New commits:
commit 0a3f2d4da89474d5e680011aab65f81025b5eba6
Author: Ivan Timofeev timofeev@gmail.com
Date: Sat Jan 7 21:32:21 2012 +0200
Add a missing space in the format - page - organizer tab
(cherry picked from commit ba759d70ba84280ef5d25f644357e04471bffab9)
diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx
index 0ac676d..e544382 100644
--- a/svx/source/items/pageitem.cxx
+++ b/svx/source/items/pageitem.cxx
@@ -136,7 +136,12 @@ SfxItemPresentation SvxPageItem::GetPresentation
rText += SVX_RESSTR(RID_SVXITEMS_PAGE_LAND_TRUE);
else
rText += SVX_RESSTR(RID_SVXITEMS_PAGE_LAND_FALSE);
-rText += GetUsageText( eUse );
+String aUsageText = GetUsageText( eUse );
+if (aUsageText.Len())
+{
+rText += cpDelim;
+rText += aUsageText;
+}
return SFX_ITEM_PRESENTATION_NAMELESS;
}
case SFX_ITEM_PRESENTATION_COMPLETE:
@@ -154,7 +159,12 @@ SfxItemPresentation SvxPageItem::GetPresentation
rText += SVX_RESSTR(RID_SVXITEMS_PAGE_LAND_TRUE);
else
rText += SVX_RESSTR(RID_SVXITEMS_PAGE_LAND_FALSE);
-rText += GetUsageText( eUse );
+String aUsageText = GetUsageText( eUse );
+if (aUsageText.Len())
+{
+rText += cpDelim;
+rText += aUsageText;
+}
return SFX_ITEM_PRESENTATION_COMPLETE;
}
default: ;//prevent warning
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/items/pageitem.cxx | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
New commits:
commit ba759d70ba84280ef5d25f644357e04471bffab9
Author: Ivan Timofeev timofeev@gmail.com
Date: Sat Jan 7 21:32:21 2012 +0200
Add a missing space in the format - page - organizer tab
diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx
index b67d01f..cd9fef7 100644
--- a/svx/source/items/pageitem.cxx
+++ b/svx/source/items/pageitem.cxx
@@ -136,7 +136,12 @@ SfxItemPresentation SvxPageItem::GetPresentation
rText += SVX_RESSTR(RID_SVXITEMS_PAGE_LAND_TRUE);
else
rText += SVX_RESSTR(RID_SVXITEMS_PAGE_LAND_FALSE);
-rText += GetUsageText( eUse );
+String aUsageText = GetUsageText( eUse );
+if (aUsageText.Len())
+{
+rText += cpDelim;
+rText += aUsageText;
+}
return SFX_ITEM_PRESENTATION_NAMELESS;
}
case SFX_ITEM_PRESENTATION_COMPLETE:
@@ -154,7 +159,12 @@ SfxItemPresentation SvxPageItem::GetPresentation
rText += SVX_RESSTR(RID_SVXITEMS_PAGE_LAND_TRUE);
else
rText += SVX_RESSTR(RID_SVXITEMS_PAGE_LAND_FALSE);
-rText += GetUsageText( eUse );
+String aUsageText = GetUsageText( eUse );
+if (aUsageText.Len())
+{
+rText += cpDelim;
+rText += aUsageText;
+}
return SFX_ITEM_PRESENTATION_COMPLETE;
}
default: ;//prevent warning
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/items/svxitems.src | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit b95be347d45c90febdeca85d22b65c03fba283bc
Author: Andras Timar ati...@suse.com
Date: Sat Jan 7 22:08:09 2012 +0100
make measurement units localizable
diff --git a/editeng/source/items/svxitems.src
b/editeng/source/items/svxitems.src
index 222fc2c..6049ad6 100644
--- a/editeng/source/items/svxitems.src
+++ b/editeng/source/items/svxitems.src
@@ -598,27 +598,27 @@ String RID_OUTSET
};
String RID_SVXITEMS_METRIC_MM
{
-Text = mm ;
+Text [ en-US ] = mm ;
};
String RID_SVXITEMS_METRIC_CM
{
-Text = cm ;
+Text [ en-US ] = cm ;
};
String RID_SVXITEMS_METRIC_INCH
{
-Text = inch ;
+Text [ en-US ] = inch ;
};
String RID_SVXITEMS_METRIC_POINT
{
-Text = pt ;
+Text [ en-US ] = pt ;
};
String RID_SVXITEMS_METRIC_TWIP
{
-Text = twip ;
+Text [ en-US ] = twip ;
};
String RID_SVXITEMS_METRIC_PIXEL
{
-Text = pixel ;
+Text [ en-US ] = pixel ;
};
// GetValueText von BoolItems
String RID_SVXITEMS_SHADOWED_TRUE
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - editeng/source
editeng/source/items/svxitems.src | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 87ac00c1caba23aa7bddc08085fe4263fb184b14
Author: Andras Timar ati...@suse.com
Date: Sat Jan 7 22:08:09 2012 +0100
make measurement units localizable
diff --git a/editeng/source/items/svxitems.src
b/editeng/source/items/svxitems.src
index 222fc2c..6049ad6 100644
--- a/editeng/source/items/svxitems.src
+++ b/editeng/source/items/svxitems.src
@@ -598,27 +598,27 @@ String RID_OUTSET
};
String RID_SVXITEMS_METRIC_MM
{
-Text = mm ;
+Text [ en-US ] = mm ;
};
String RID_SVXITEMS_METRIC_CM
{
-Text = cm ;
+Text [ en-US ] = cm ;
};
String RID_SVXITEMS_METRIC_INCH
{
-Text = inch ;
+Text [ en-US ] = inch ;
};
String RID_SVXITEMS_METRIC_POINT
{
-Text = pt ;
+Text [ en-US ] = pt ;
};
String RID_SVXITEMS_METRIC_TWIP
{
-Text = twip ;
+Text [ en-US ] = twip ;
};
String RID_SVXITEMS_METRIC_PIXEL
{
-Text = pixel ;
+Text [ en-US ] = pixel ;
};
// GetValueText von BoolItems
String RID_SVXITEMS_SHADOWED_TRUE
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cui/source desktop/source
cui/source/tabpages/tabarea.src |8
cui/source/tabpages/textanim.src |2 +-
desktop/source/app/desktop.src |2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 1e847daddfb4002278049ada523834c196aa8b10
Author: Andras Timar ati...@suse.com
Date: Sat Jan 7 22:56:54 2012 +0100
yet another few strings to localize
diff --git a/cui/source/tabpages/tabarea.src b/cui/source/tabpages/tabarea.src
index a3e1e54..b1117b1 100644
--- a/cui/source/tabpages/tabarea.src
+++ b/cui/source/tabpages/tabarea.src
@@ -1309,7 +1309,7 @@ TabPage RID_SVXPAGE_COLOR
{
Pos = MAP_APPFONT ( 142 , 89 ) ;
Size = MAP_APPFONT ( 15 , 8 ) ;
-Text = ~C ;
+Text [ en-US ] = ~C ;
};
MetricField MTR_FLD_1
{
@@ -1329,7 +1329,7 @@ TabPage RID_SVXPAGE_COLOR
{
Pos = MAP_APPFONT ( 142 , 105 ) ;
Size = MAP_APPFONT ( 15 , 8 ) ;
-Text = ~M ;
+Text [ en-US ] = ~M ;
};
MetricField MTR_FLD_2
{
@@ -1349,7 +1349,7 @@ TabPage RID_SVXPAGE_COLOR
{
Pos = MAP_APPFONT ( 142 , 121 ) ;
Size = MAP_APPFONT ( 15 , 8 ) ;
-Text = ~Y ;
+Text [ en-US ] = ~Y ;
};
MetricField MTR_FLD_3
{
@@ -1369,7 +1369,7 @@ TabPage RID_SVXPAGE_COLOR
{
Pos = MAP_APPFONT ( 142 , 137 ) ;
Size = MAP_APPFONT ( 15 , 8 ) ;
-Text = ~K ;
+Text [ en-US ] = ~K ;
};
MetricField MTR_FLD_4
{
diff --git a/cui/source/tabpages/textanim.src b/cui/source/tabpages/textanim.src
index f015028..b330565 100644
--- a/cui/source/tabpages/textanim.src
+++ b/cui/source/tabpages/textanim.src
@@ -272,7 +272,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
Spinsize = 50 ;
StrictFormat = TRUE ;
Unit = FUNIT_CUSTOM ;
-CustomUnitText = ms ;
+CustomUnitText [ en-US ] = ms ;
Maximum = 3 ;
Last = 3 ;
};
diff --git a/desktop/source/app/desktop.src b/desktop/source/app/desktop.src
index 98ee686..0b6bc3f 100644
--- a/desktop/source/app/desktop.src
+++ b/desktop/source/app/desktop.src
@@ -160,7 +160,7 @@ InfoBox INFOBOX_CMDLINEHELP
ModalDialog DLG_CMDLINEHELP
{
HelpID = desktop:ModalDialog:DLG_CMDLINEHELP;
-Text = Help Message...;
+Text [ en-US ] = Help Message...;
Size = MAP_APPFONT(250, 365);
Border = True;
SVLook = True;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - cui/source desktop/source
cui/source/tabpages/tabarea.src |8
cui/source/tabpages/textanim.src |2 +-
desktop/source/app/desktop.src |2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit daab19c2ae13245318b8fcd1a5468cae7ab43348
Author: Andras Timar ati...@suse.com
Date: Sat Jan 7 22:56:54 2012 +0100
yet another few strings to localize
diff --git a/cui/source/tabpages/tabarea.src b/cui/source/tabpages/tabarea.src
index a3e1e54..b1117b1 100644
--- a/cui/source/tabpages/tabarea.src
+++ b/cui/source/tabpages/tabarea.src
@@ -1309,7 +1309,7 @@ TabPage RID_SVXPAGE_COLOR
{
Pos = MAP_APPFONT ( 142 , 89 ) ;
Size = MAP_APPFONT ( 15 , 8 ) ;
-Text = ~C ;
+Text [ en-US ] = ~C ;
};
MetricField MTR_FLD_1
{
@@ -1329,7 +1329,7 @@ TabPage RID_SVXPAGE_COLOR
{
Pos = MAP_APPFONT ( 142 , 105 ) ;
Size = MAP_APPFONT ( 15 , 8 ) ;
-Text = ~M ;
+Text [ en-US ] = ~M ;
};
MetricField MTR_FLD_2
{
@@ -1349,7 +1349,7 @@ TabPage RID_SVXPAGE_COLOR
{
Pos = MAP_APPFONT ( 142 , 121 ) ;
Size = MAP_APPFONT ( 15 , 8 ) ;
-Text = ~Y ;
+Text [ en-US ] = ~Y ;
};
MetricField MTR_FLD_3
{
@@ -1369,7 +1369,7 @@ TabPage RID_SVXPAGE_COLOR
{
Pos = MAP_APPFONT ( 142 , 137 ) ;
Size = MAP_APPFONT ( 15 , 8 ) ;
-Text = ~K ;
+Text [ en-US ] = ~K ;
};
MetricField MTR_FLD_4
{
diff --git a/cui/source/tabpages/textanim.src b/cui/source/tabpages/textanim.src
index f015028..b330565 100644
--- a/cui/source/tabpages/textanim.src
+++ b/cui/source/tabpages/textanim.src
@@ -272,7 +272,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
Spinsize = 50 ;
StrictFormat = TRUE ;
Unit = FUNIT_CUSTOM ;
-CustomUnitText = ms ;
+CustomUnitText [ en-US ] = ms ;
Maximum = 3 ;
Last = 3 ;
};
diff --git a/desktop/source/app/desktop.src b/desktop/source/app/desktop.src
index 98ee686..0b6bc3f 100644
--- a/desktop/source/app/desktop.src
+++ b/desktop/source/app/desktop.src
@@ -160,7 +160,7 @@ InfoBox INFOBOX_CMDLINEHELP
ModalDialog DLG_CMDLINEHELP
{
HelpID = desktop:ModalDialog:DLG_CMDLINEHELP;
-Text = Help Message...;
+Text [ en-US ] = Help Message...;
Size = MAP_APPFONT(250, 365);
Border = True;
SVLook = True;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 7 commits - avmedia/source basic/source solenv/bin svtools/inc svtools/source vcl/inc vcl/source
avmedia/source/gstreamer/gstplayer.cxx |4 -
basic/source/comp/exprnode.cxx |5 -
basic/source/comp/exprtree.cxx | 18 -
basic/source/inc/expr.hxx |3
solenv/bin/mkdocs.sh |2
svtools/inc/svtools/headbar.hxx|9 --
svtools/source/control/headbar.cxx | 75 --
vcl/inc/vcl/gdimtf.hxx |7 --
vcl/inc/vcl/graphictools.hxx | 89 --
vcl/source/gdi/gdimtf.cxx | 96
vcl/source/gdi/graphictools.cxx| 110 -
11 files changed, 4 insertions(+), 414 deletions(-)
New commits:
commit 6c3cfe6059c31c980d123f413a69d536887c336d
Author: August Sodora aug...@gmail.com
Date: Fri Jan 6 21:27:42 2012 -0500
Generate docs for basic
diff --git a/solenv/bin/mkdocs.sh b/solenv/bin/mkdocs.sh
index 77e7562..1112b0f 100755
--- a/solenv/bin/mkdocs.sh
+++ b/solenv/bin/mkdocs.sh
@@ -23,7 +23,7 @@ DOXYGEN_PROJECT_PREFIX=LibreOffice
. ./Env.Host.sh
# get list of modules in build order - bah, blows RAM disk, static list below
-INPUT_PROJECTS=o3tl basegfx basebmp comphelper svl vcl canvas cppcanvas oox
svtools goodies drawinglayer xmloff slideshow sfx2 editeng svx writerfilter cui
chart2 dbaccess sd starmath sc sw
+INPUT_PROJECTS=o3tl basegfx basebmp basic comphelper svl vcl canvas cppcanvas
oox svtools goodies drawinglayer xmloff slideshow sfx2 editeng svx writerfilter
cui chart2 dbaccess sd starmath sc sw
# output directory for generated documentation
BASE_OUTPUT=$1
commit a3b6842cc91fee88b9a6fd48008d1c7e53d67108
Author: August Sodora aug...@gmail.com
Date: Fri Jan 6 14:28:27 2012 -0500
cppcheck: cstyleCast
diff --git a/avmedia/source/gstreamer/gstplayer.cxx
b/avmedia/source/gstreamer/gstplayer.cxx
index 14cdbb5..0e73177 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -112,7 +112,7 @@ Player::~Player()
static gboolean gst_pipeline_bus_callback( GstBus *, GstMessage *message,
gpointer data )
{
-Player* pPlayer = (Player *) data;
+Player* pPlayer = static_castPlayer*(data);
pPlayer-processMessage( message );
@@ -121,7 +121,7 @@ static gboolean gst_pipeline_bus_callback( GstBus *,
GstMessage *message, gpoint
static GstBusSyncReply gst_pipeline_bus_sync_handler( GstBus *, GstMessage *
message, gpointer data )
{
-Player* pPlayer = (Player *) data;
+Player* pPlayer = static_castPlayer*(data);
return pPlayer-processSyncMessage( message );
}
commit 743e627bcfc9c87d806109fe6f3f4e2817b73dda
Author: August Sodora aug...@gmail.com
Date: Fri Jan 6 14:26:01 2012 -0500
Remove unused code
diff --git a/vcl/inc/vcl/graphictools.hxx b/vcl/inc/vcl/graphictools.hxx
index 5161620..c027f6a 100644
--- a/vcl/inc/vcl/graphictools.hxx
+++ b/vcl/inc/vcl/graphictools.hxx
@@ -153,50 +153,6 @@ public:
// mutators
/// Set path to stroke
voidsetPath ( const Polygon );
-/** Set the polygon that is put at the start of the line
-
-The polygon has to be in a special normalized position, and
-already scaled to the desired size: the center of the stroked
-path will meet the given polygon at (0,0) from negative y
-values. Thus, an arrow would have its baseline on the x axis,
-going upwards to positive y values. Furthermore, the polygon
-also has to be scaled appropriately: the width of the joining
-stroke is defined to be SvtGraphicStroke::normalizedArrowWidth
-(0x1), i.e. ranging from x=-0x8000 to x=0x8000. If your
-arrow does have this width, it will fit every stroke with
-every stroke width exactly.
- */
-voidsetStartArrow ( const PolyPolygon );
-/** Set the polygon that is put at the end of the line
-
-The polygon has to be in a special normalized position, and
-already scaled to the desired size: the center of the stroked
-path will meet the given polygon at (0,0) from negative y
-values. Thus, an arrow would have its baseline on the x axis,
-going upwards to positive y values. Furthermore, the polygon
-also has to be scaled appropriately: the width of the joining
-stroke is defined to be SvtGraphicStroke::normalizedArrowWidth
-(0x1), i.e. ranging from x=-0x8000 to x=0x8000. If your
-arrow does have this width, it will fit every stroke with
-every stroke width exactly.
- */
-voidsetEndArrow ( const PolyPolygon );
-/** Set stroke transparency
-
-@param fTrans
-The transparency, ranging from 0.0 (opaque) to 1.0 (fully translucent)
- */
-voidsetTransparency ( double fTrans );
-/// Set width of the stroke
-voidsetStrokeWidth ( double );
-/// Set the style in which open stroke ends are drawn
-void
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/core/data/documen9.cxx |2 +-
sc/source/core/data/table1.cxx |3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 6b7080c102e56651803831aaa12c3c86efbce858
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Sat Jan 7 18:18:15 2012 -0500
Reset sheet ID of cell-anchored drawing objects when deleting sheet(s).
This prevents drawing objects from disappearing on file reload.
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index e4dec4f..d701597 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -257,7 +257,7 @@ void ScDocument::DrawCopyPage( sal_uInt16 nOldPos,
sal_uInt16 nNewPos )
{
// angelegt wird die Page schon im ScTable ctor
pDrawLayer-ScCopyPage( nOldPos, nNewPos, false );
-pDrawLayer-ResetTab(static_castSCTAB(nNewPos),
static_castSCTAB(maTabs.size()));
+pDrawLayer-ResetTab(static_castSCTAB(nNewPos),
static_castSCTAB(maTabs.size()-1));
}
void ScDocument::DeleteObjectsInArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
SCROW nRow2,
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 06b8203..2464340 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -331,7 +331,10 @@ ScTable::~ScTable()
ScDrawLayer* pDrawLayer = pDocument-GetDrawLayer();
if (pDrawLayer)
+{
pDrawLayer-ScRemovePage( nTab );
+pDrawLayer-ResetTab(nTab, pDocument-GetTableCount()-1);
+}
}
delete[] pColWidth;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/core/data/documen9.cxx |2 +-
sc/source/core/data/table1.cxx |3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 1f6e412a8fc7f7a22f0872eda3be6545a7cee5eb
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Sat Jan 7 18:18:15 2012 -0500
Reset sheet ID of cell-anchored drawing objects when deleting sheet(s).
This prevents drawing objects from disappearing on file reload.
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index e4dec4f..d701597 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -257,7 +257,7 @@ void ScDocument::DrawCopyPage( sal_uInt16 nOldPos,
sal_uInt16 nNewPos )
{
// angelegt wird die Page schon im ScTable ctor
pDrawLayer-ScCopyPage( nOldPos, nNewPos, false );
-pDrawLayer-ResetTab(static_castSCTAB(nNewPos),
static_castSCTAB(maTabs.size()));
+pDrawLayer-ResetTab(static_castSCTAB(nNewPos),
static_castSCTAB(maTabs.size()-1));
}
void ScDocument::DeleteObjectsInArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
SCROW nRow2,
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 93285a2..61e9bb6 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -333,7 +333,10 @@ ScTable::~ScTable()
ScDrawLayer* pDrawLayer = pDocument-GetDrawLayer();
if (pDrawLayer)
+{
pDrawLayer-ScRemovePage( nTab );
+pDrawLayer-ResetTab(nTab, pDocument-GetTableCount()-1);
+}
}
delete[] pColWidth;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - basic/inc basic/source
basic/inc/basrid.hxx |6 ---
basic/source/comp/scanner.cxx | 79 --
basic/source/inc/scanner.hxx |1
3 files changed, 47 insertions(+), 39 deletions(-)
New commits:
commit d3a52bd7b3fe11fc6cf5f3296dd00eba524e40a0
Author: August Sodora aug...@gmail.com
Date: Sat Jan 7 18:32:47 2012 -0500
scanner cleanup for consistency
diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index 7eb6fb0..25a493a 100644
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -162,18 +162,18 @@ void SbiScanner::scanAlphanumeric()
void SbiScanner::scanGoto()
{
-sal_Int32 nTestCol = nCol;
-while(nTestCol aLine.getLength()
theBasicCharClass::get().isWhitespace(aLine[nTestCol]))
-nTestCol++;
+sal_Int32 n = nCol;
+while(n aLine.getLength()
theBasicCharClass::get().isWhitespace(aLine[n]))
+++n;
-if(nTestCol + 1 aLine.getLength())
+if(n + 1 aLine.getLength())
{
-::rtl::OUString aTestSym = aLine.copy(nTestCol, 2);
-
if(aTestSym.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(to)))
+::rtl::OUString aTemp = aLine.copy(n, 2);
+if(aTemp.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(to)))
{
aSym = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(goto));
-pLine += nTestCol + 2 - nCol;
-nCol = nTestCol + 2;
+pLine += n + 2 - nCol;
+nCol = n + 2;
}
}
}
commit 1e04280bce397f6c4c6715ab882fa9fd8f372c09
Author: August Sodora aug...@gmail.com
Date: Sat Jan 7 18:23:45 2012 -0500
Refactor readLine in scanner
diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index 1c49f98..7eb6fb0 100644
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -178,6 +178,40 @@ void SbiScanner::scanGoto()
}
}
+bool SbiScanner::readLine()
+{
+if(nBufPos = aBuf.getLength())
+return false;
+
+sal_Int32 n = nBufPos;
+sal_Int32 nLen = aBuf.getLength();
+
+while(n nLen aBuf[n] != '\r' aBuf[n] != '\n')
+++n;
+
+// Trim trailing whitespace
+sal_Int32 nEnd = n;
+while(nBufPos nEnd theBasicCharClass::get().isWhitespace(aBuf[nEnd -
1]))
+--nEnd;
+
+aLine = aBuf.copy(nBufPos, nEnd - nBufPos);
+
+// Fast-forward past the line ending
+if(n + 1 nLen aBuf[n] == '\r' aBuf[n + 1] == '\n')
+n += 2;
+else if(n nLen)
+n++;
+
+nBufPos = n;
+pLine = aLine.getStr();
+
+++nLine;
+nCol = nCol1 = nCol2 = 0;
+nColLock = 0;
+
+return true;
+}
+
bool SbiScanner::NextSym()
{
// memorize for the EOLN-case
@@ -195,33 +229,12 @@ bool SbiScanner::NextSym()
// read in line?
if( !pLine )
{
-sal_Int32 n = nBufPos;
-sal_Int32 nLen = aBuf.getLength();
-if( nBufPos = nLen )
+if(!readLine())
return false;
-const sal_Unicode* p2 = aBuf.getStr();
-p2 += n;
-while( ( n nLen ) ( *p2 != '\n' ) ( *p2 != '\r' ) )
-p2++, n++;
-// #163944# ignore trailing whitespace
-sal_Int32 nCopyEndPos = n;
-while( (nBufPos nCopyEndPos)
theBasicCharClass::get().isWhitespace( aBuf[ nCopyEndPos - 1 ] ) )
---nCopyEndPos;
-aLine = aBuf.copy( nBufPos, nCopyEndPos - nBufPos );
-if( n nLen )
-{
-if( *p2 == '\r' *( p2+1 ) == '\n' )
-n += 2;
-else
-n++;
-}
-nBufPos = n;
-pLine = aLine.getStr();
-nOldLine = ++nLine;
-nCol = nCol1 = nCol2 = nOldCol1 = nOldCol2 = 0;
-nColLock = 0;
-}
+nOldLine = nLine;
+nOldCol1 = nOldCol2 = 0;
+}
while( theBasicCharClass::get().isWhitespace( *pLine ) )
pLine++, nCol++, bSpaces = true;
diff --git a/basic/source/inc/scanner.hxx b/basic/source/inc/scanner.hxx
index 96b0658..69c3d87 100644
--- a/basic/source/inc/scanner.hxx
+++ b/basic/source/inc/scanner.hxx
@@ -48,6 +48,7 @@ class SbiScanner
void scanAlphanumeric();
void scanGoto();
+bool readLine();
protected:
::rtl::OUString aSym;
String aError;
commit db1faf486837c44a69406a53ea67f66a6fe56d34
Author: August Sodora aug...@gmail.com
Date: Sat Jan 7 17:50:21 2012 -0500
Remove unused class SttResId
diff --git a/basic/inc/basrid.hxx b/basic/inc/basrid.hxx
index f79778c..ecb55fc 100644
--- a/basic/inc/basrid.hxx
+++ b/basic/inc/basrid.hxx
@@ -31,12 +31,6 @@
#include tools/resid.hxx
-class SttResId : public ResId
-{
-public:
-SttResId( sal_uInt32 nId );
-};
-
class BasResId : public ResId
{
public:
___
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
sc/source/core/data/documen9.cxx |1 -
sc/source/core/data/drwlayer.cxx |6 ++
sc/source/core/data/table1.cxx |3 ---
3 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 779884e790461eb173c6aa1324240d6d13a5
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Sat Jan 7 18:44:21 2012 -0500
Reset sheet index of drawing objects when moving sheet too.
If not, cell-anchored objects would get stuck on the old sheet
position, which is not good.
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 2bbd35e..69f289a 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -421,6 +421,8 @@ void ScDrawLayer::ScRenamePage( SCTAB nTab, const String
rNewName )
void ScDrawLayer::ScMovePage( sal_uInt16 nOldPos, sal_uInt16 nNewPos )
{
MovePage( nOldPos, nNewPos );
+sal_uInt16 nMinPos = std::min(nOldPos, nNewPos);
+ResetTab(nMinPos, pDoc-GetTableCount()-1);
}
void ScDrawLayer::ScCopyPage( sal_uInt16 nOldPos, sal_uInt16 nNewPos, sal_Bool
bAlloc )
commit 292cec8ff30181a7c3c253362cd5e2a93cc134db
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Sat Jan 7 18:38:12 2012 -0500
Better to internalize the sheet ID reset within ScDrawLayer...
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index d701597..b8cca4c 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -257,7 +257,6 @@ void ScDocument::DrawCopyPage( sal_uInt16 nOldPos,
sal_uInt16 nNewPos )
{
// angelegt wird die Page schon im ScTable ctor
pDrawLayer-ScCopyPage( nOldPos, nNewPos, false );
-pDrawLayer-ResetTab(static_castSCTAB(nNewPos),
static_castSCTAB(maTabs.size()-1));
}
void ScDocument::DeleteObjectsInArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
SCROW nRow2,
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 91820f4..2bbd35e 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -407,6 +407,8 @@ void ScDrawLayer::ScRemovePage( SCTAB nTab )
}
else
DeletePage( static_castsal_uInt16(nTab) );
// einfach weg damit
+
+ResetTab(nTab, pDoc-GetTableCount()-1);
}
void ScDrawLayer::ScRenamePage( SCTAB nTab, const String rNewName )
@@ -470,6 +472,8 @@ void ScDrawLayer::ScCopyPage( sal_uInt16 nOldPos,
sal_uInt16 nNewPos, sal_Bool b
if (bAlloc)
InsertPage(pNewPage, nNewPos);
+
+ResetTab(static_castSCTAB(nNewPos), pDoc-GetTableCount()-1);
}
void ScDrawLayer::ResetTab( SCTAB nStart, SCTAB nEnd )
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 2464340..06b8203 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -331,10 +331,7 @@ ScTable::~ScTable()
ScDrawLayer* pDrawLayer = pDocument-GetDrawLayer();
if (pDrawLayer)
-{
pDrawLayer-ScRemovePage( nTab );
-pDrawLayer-ResetTab(nTab, pDocument-GetTableCount()-1);
-}
}
delete[] pColWidth;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sc/source
sc/source/core/data/documen9.cxx |1 -
sc/source/core/data/drwlayer.cxx |6 ++
sc/source/core/data/table1.cxx |3 ---
3 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 834f7c51ea1a51c6022da25fad9d0389682c5d52
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Sat Jan 7 18:44:21 2012 -0500
Reset sheet index of drawing objects when moving sheet too.
If not, cell-anchored objects would get stuck on the old sheet
position, which is not good.
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 2bbd35e..69f289a 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -421,6 +421,8 @@ void ScDrawLayer::ScRenamePage( SCTAB nTab, const String
rNewName )
void ScDrawLayer::ScMovePage( sal_uInt16 nOldPos, sal_uInt16 nNewPos )
{
MovePage( nOldPos, nNewPos );
+sal_uInt16 nMinPos = std::min(nOldPos, nNewPos);
+ResetTab(nMinPos, pDoc-GetTableCount()-1);
}
void ScDrawLayer::ScCopyPage( sal_uInt16 nOldPos, sal_uInt16 nNewPos, sal_Bool
bAlloc )
commit aeb3af4ea06cb1f17b0177ab77c88f809fb99427
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Sat Jan 7 18:38:12 2012 -0500
Better to internalize the sheet ID reset within ScDrawLayer...
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index d701597..b8cca4c 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -257,7 +257,6 @@ void ScDocument::DrawCopyPage( sal_uInt16 nOldPos,
sal_uInt16 nNewPos )
{
// angelegt wird die Page schon im ScTable ctor
pDrawLayer-ScCopyPage( nOldPos, nNewPos, false );
-pDrawLayer-ResetTab(static_castSCTAB(nNewPos),
static_castSCTAB(maTabs.size()-1));
}
void ScDocument::DeleteObjectsInArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
SCROW nRow2,
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 91820f4..2bbd35e 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -407,6 +407,8 @@ void ScDrawLayer::ScRemovePage( SCTAB nTab )
}
else
DeletePage( static_castsal_uInt16(nTab) );
// einfach weg damit
+
+ResetTab(nTab, pDoc-GetTableCount()-1);
}
void ScDrawLayer::ScRenamePage( SCTAB nTab, const String rNewName )
@@ -470,6 +472,8 @@ void ScDrawLayer::ScCopyPage( sal_uInt16 nOldPos,
sal_uInt16 nNewPos, sal_Bool b
if (bAlloc)
InsertPage(pNewPage, nNewPos);
+
+ResetTab(static_castSCTAB(nNewPos), pDoc-GetTableCount()-1);
}
void ScDrawLayer::ResetTab( SCTAB nStart, SCTAB nEnd )
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 61e9bb6..93285a2 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -333,10 +333,7 @@ ScTable::~ScTable()
ScDrawLayer* pDrawLayer = pDocument-GetDrawLayer();
if (pDrawLayer)
-{
pDrawLayer-ScRemovePage( nTab );
-pDrawLayer-ResetTab(nTab, pDocument-GetTableCount()-1);
-}
}
delete[] pColWidth;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/qa sc/source
sc/qa/unit/ucalc.cxx | 17 + sc/source/core/data/drwlayer.cxx |3 ++- 2 files changed, 19 insertions(+), 1 deletion(-) New commits: commit 9bf924c04639f6c3210661716916382633b7b536 Author: Kohei Yoshida kohei.yosh...@suse.com Date: Sat Jan 7 19:09:24 2012 -0500 More unit test code for drawing objects. Found another bug fixed it. Inserting a new sheet would not update the anchored sheet index. Fixed. diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index 1adc2bf..c9c6b4b 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -48,6 +48,7 @@ #include attrib.hxx #include dbdata.hxx #include reftokenhelper.hxx +#include userdat.hxx #include docsh.hxx #include docfunc.hxx @@ -2526,6 +2527,10 @@ void Test::testGraphicsOnSheetMove() CPPUNIT_ASSERT_MESSAGE(There should be one object on the 1st sheet., pPage-GetObjCount() == 1); +const ScDrawObjData* pData = ScDrawLayer::GetObjData(pObj); +CPPUNIT_ASSERT_MESSAGE(Object meta-data doesn't exist., pData); +CPPUNIT_ASSERT_MESSAGE(Wrong sheet ID in cell anchor data!, pData-maStart.Tab() == 0 pData-maEnd.Tab() == 0); + pPage = pDrawLayer-GetPage(1); CPPUNIT_ASSERT_MESSAGE(No page instance for the 2nd sheet., pPage); CPPUNIT_ASSERT_MESSAGE(2nd sheet shouldn't have any object., pPage-GetObjCount() == 0); @@ -2541,6 +2546,8 @@ void Test::testGraphicsOnSheetMove() pPage = pDrawLayer-GetPage(2); CPPUNIT_ASSERT_MESSAGE(3rd sheet should have no object., pPage pPage-GetObjCount() == 0); +CPPUNIT_ASSERT_MESSAGE(Wrong sheet ID in cell anchor data!, pData-maStart.Tab() == 1 pData-maEnd.Tab() == 1); + // Now, delete the sheet that just got inserted. The object should be back // on the 1st sheet. m_pDoc-DeleteTab(0); @@ -2549,6 +2556,16 @@ void Test::testGraphicsOnSheetMove() CPPUNIT_ASSERT_MESSAGE(Size and position of the object shouldn't change., pObj-GetLogicRect() == aObjRect); +CPPUNIT_ASSERT_MESSAGE(Wrong sheet ID in cell anchor data!, pData-maStart.Tab() == 0 pData-maEnd.Tab() == 0); + +// Move the 1st sheet to the last position. +m_pDoc-MoveTab(0, 1); +pPage = pDrawLayer-GetPage(0); +CPPUNIT_ASSERT_MESSAGE(1st sheet should have no object., pPage pPage-GetObjCount() == 0); +pPage = pDrawLayer-GetPage(1); +CPPUNIT_ASSERT_MESSAGE(2nd sheet should have one object., pPage pPage-GetObjCount() == 1); +CPPUNIT_ASSERT_MESSAGE(Wrong sheet ID in cell anchor data!, pData-maStart.Tab() == 1 pData-maEnd.Tab() == 1); + m_pDoc-DeleteTab(1); m_pDoc-DeleteTab(0); } diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index 69f289a..087d510 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -390,7 +390,8 @@ sal_Bool ScDrawLayer::ScAddPage( SCTAB nTab ) if (bRecording) AddCalcUndo(new SdrUndoNewPage(*pPage)); -return sal_True;// inserted +ResetTab(nTab, pDoc-GetTableCount()-1); +return true;// inserted } void ScDrawLayer::ScRemovePage( SCTAB nTab ) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/qa sc/source
sc/qa/unit/ucalc.cxx | 17 + sc/source/core/data/drwlayer.cxx |3 ++- 2 files changed, 19 insertions(+), 1 deletion(-) New commits: commit d831f352ba4969f4e5ed0d1057a773d5a472d4aa Author: Kohei Yoshida kohei.yosh...@suse.com Date: Sat Jan 7 19:09:24 2012 -0500 More unit test code for drawing objects. Found another bug fixed it. Inserting a new sheet would not update the anchored sheet index. Fixed. diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index 1adc2bf..c9c6b4b 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -48,6 +48,7 @@ #include attrib.hxx #include dbdata.hxx #include reftokenhelper.hxx +#include userdat.hxx #include docsh.hxx #include docfunc.hxx @@ -2526,6 +2527,10 @@ void Test::testGraphicsOnSheetMove() CPPUNIT_ASSERT_MESSAGE(There should be one object on the 1st sheet., pPage-GetObjCount() == 1); +const ScDrawObjData* pData = ScDrawLayer::GetObjData(pObj); +CPPUNIT_ASSERT_MESSAGE(Object meta-data doesn't exist., pData); +CPPUNIT_ASSERT_MESSAGE(Wrong sheet ID in cell anchor data!, pData-maStart.Tab() == 0 pData-maEnd.Tab() == 0); + pPage = pDrawLayer-GetPage(1); CPPUNIT_ASSERT_MESSAGE(No page instance for the 2nd sheet., pPage); CPPUNIT_ASSERT_MESSAGE(2nd sheet shouldn't have any object., pPage-GetObjCount() == 0); @@ -2541,6 +2546,8 @@ void Test::testGraphicsOnSheetMove() pPage = pDrawLayer-GetPage(2); CPPUNIT_ASSERT_MESSAGE(3rd sheet should have no object., pPage pPage-GetObjCount() == 0); +CPPUNIT_ASSERT_MESSAGE(Wrong sheet ID in cell anchor data!, pData-maStart.Tab() == 1 pData-maEnd.Tab() == 1); + // Now, delete the sheet that just got inserted. The object should be back // on the 1st sheet. m_pDoc-DeleteTab(0); @@ -2549,6 +2556,16 @@ void Test::testGraphicsOnSheetMove() CPPUNIT_ASSERT_MESSAGE(Size and position of the object shouldn't change., pObj-GetLogicRect() == aObjRect); +CPPUNIT_ASSERT_MESSAGE(Wrong sheet ID in cell anchor data!, pData-maStart.Tab() == 0 pData-maEnd.Tab() == 0); + +// Move the 1st sheet to the last position. +m_pDoc-MoveTab(0, 1); +pPage = pDrawLayer-GetPage(0); +CPPUNIT_ASSERT_MESSAGE(1st sheet should have no object., pPage pPage-GetObjCount() == 0); +pPage = pDrawLayer-GetPage(1); +CPPUNIT_ASSERT_MESSAGE(2nd sheet should have one object., pPage pPage-GetObjCount() == 1); +CPPUNIT_ASSERT_MESSAGE(Wrong sheet ID in cell anchor data!, pData-maStart.Tab() == 1 pData-maEnd.Tab() == 1); + m_pDoc-DeleteTab(1); m_pDoc-DeleteTab(0); } diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index 69f289a..087d510 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -390,7 +390,8 @@ sal_Bool ScDrawLayer::ScAddPage( SCTAB nTab ) if (bRecording) AddCalcUndo(new SdrUndoNewPage(*pPage)); -return sal_True;// inserted +ResetTab(nTab, pDoc-GetTableCount()-1); +return true;// inserted } void ScDrawLayer::ScRemovePage( SCTAB nTab ) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/qa
sc/qa/unit/ucalc.cxx | 13 - 1 file changed, 12 insertions(+), 1 deletion(-) New commits: commit bc6b37c0e7e3fff9b8875fef6d4f95f101e88f95 Author: Kohei Yoshida kohei.yosh...@suse.com Date: Sat Jan 7 19:20:20 2012 -0500 More unit test code to test copying a sheet with drawing object. diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index c9c6b4b..18fb569 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -2521,7 +2521,7 @@ void Test::testGraphicsOnSheetMove() // Insert an object. Rectangle aObjRect(2,2,100,100); -SdrRectObj* pObj = new SdrRectObj(aObjRect); +SdrObject* pObj = new SdrRectObj(aObjRect); pPage-InsertObject(pObj); ScDrawLayer::SetCellAnchoredFromPosition(*pObj, *m_pDoc, 0); @@ -2566,6 +2566,17 @@ void Test::testGraphicsOnSheetMove() CPPUNIT_ASSERT_MESSAGE(2nd sheet should have one object., pPage pPage-GetObjCount() == 1); CPPUNIT_ASSERT_MESSAGE(Wrong sheet ID in cell anchor data!, pData-maStart.Tab() == 1 pData-maEnd.Tab() == 1); +// Copy the 2nd sheet, which has one drawing object to the last position. +m_pDoc-CopyTab(1, 2); +pPage = pDrawLayer-GetPage(2); +CPPUNIT_ASSERT_MESSAGE(Copied sheet should have one object., pPage pPage-GetObjCount() == 1); +pObj = pPage-GetObj(0); +CPPUNIT_ASSERT_MESSAGE(Failed to get drawing object., pObj); +pData = ScDrawLayer::GetObjData(pObj); +CPPUNIT_ASSERT_MESSAGE(Failed to get drawing object meta-data., pData); +CPPUNIT_ASSERT_MESSAGE(Wrong sheet ID in cell anchor data!, pData-maStart.Tab() == 2 pData-maEnd.Tab() == 2); + +m_pDoc-DeleteTab(2); m_pDoc-DeleteTab(1); m_pDoc-DeleteTab(0); } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/qa
sc/qa/unit/ucalc.cxx | 13 - 1 file changed, 12 insertions(+), 1 deletion(-) New commits: commit 5bc315f5f50b9f1cf5b4fd8b6bcba62f6d9ad1ab Author: Kohei Yoshida kohei.yosh...@suse.com Date: Sat Jan 7 19:20:20 2012 -0500 More unit test code to test copying a sheet with drawing object. diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index c9c6b4b..18fb569 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -2521,7 +2521,7 @@ void Test::testGraphicsOnSheetMove() // Insert an object. Rectangle aObjRect(2,2,100,100); -SdrRectObj* pObj = new SdrRectObj(aObjRect); +SdrObject* pObj = new SdrRectObj(aObjRect); pPage-InsertObject(pObj); ScDrawLayer::SetCellAnchoredFromPosition(*pObj, *m_pDoc, 0); @@ -2566,6 +2566,17 @@ void Test::testGraphicsOnSheetMove() CPPUNIT_ASSERT_MESSAGE(2nd sheet should have one object., pPage pPage-GetObjCount() == 1); CPPUNIT_ASSERT_MESSAGE(Wrong sheet ID in cell anchor data!, pData-maStart.Tab() == 1 pData-maEnd.Tab() == 1); +// Copy the 2nd sheet, which has one drawing object to the last position. +m_pDoc-CopyTab(1, 2); +pPage = pDrawLayer-GetPage(2); +CPPUNIT_ASSERT_MESSAGE(Copied sheet should have one object., pPage pPage-GetObjCount() == 1); +pObj = pPage-GetObj(0); +CPPUNIT_ASSERT_MESSAGE(Failed to get drawing object., pObj); +pData = ScDrawLayer::GetObjData(pObj); +CPPUNIT_ASSERT_MESSAGE(Failed to get drawing object meta-data., pData); +CPPUNIT_ASSERT_MESSAGE(Wrong sheet ID in cell anchor data!, pData-maStart.Tab() == 2 pData-maEnd.Tab() == 2); + +m_pDoc-DeleteTab(2); m_pDoc-DeleteTab(1); m_pDoc-DeleteTab(0); } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/create-tags |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit be9c3de16a29a3bffde9156af346e8b9907121ed Author: Miklos Vajna vmik...@frugalware.org Date: Sun Jan 8 02:28:25 2012 +0100 create-tags: fix ./config_host.mk: Permission denied diff --git a/solenv/bin/create-tags b/solenv/bin/create-tags index 4d0f2bd..e7cc712 100755 --- a/solenv/bin/create-tags +++ b/solenv/bin/create-tags @@ -1,6 +1,6 @@ #!/usr/bin/env sh -./config_host.mk . ./Env.Host.sh +. ./config_host.mk . ./Env.Host.sh omnicppoptions=--c++-kinds=+p --fields=+iaS --extra=+q ctags -h +.hdl.hrc --langmap=c:+.hdl.hrc.src $omnicppoptions \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/inc sc/source
sc/inc/userdat.hxx |2 +-
sc/source/core/data/drwlayer.cxx |5 +
sc/source/core/tool/detfunc.cxx |5 +++--
3 files changed, 5 insertions(+), 7 deletions(-)
New commits:
commit 08708fcc39f300c477aad581e5bdc42e5931dd8c
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Sat Jan 7 20:56:15 2012 -0500
Mark detective arrows clearly since we need to treat them differently.
Otherwise it gets confused with normal arrow objects during re-
positioning.
diff --git a/sc/inc/userdat.hxx b/sc/inc/userdat.hxx
index ed6adc2..e0463b3 100644
--- a/sc/inc/userdat.hxx
+++ b/sc/inc/userdat.hxx
@@ -59,7 +59,7 @@ public:
class ScDrawObjData : public SdrObjUserData
{
public:
-enum Type { CellNote, ValidationCircle, DrawingObject };
+enum Type { CellNote, ValidationCircle, DetectiveArrow, DrawingObject };
ScAddress maStart;
ScAddress maEnd;
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 087d510..cdbb95d 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -643,9 +643,6 @@ void ScDrawLayer::RecalcPos( SdrObject* pObj,
ScDrawObjData rData, bool bNegati
SCROW nRow2 = rData.maEnd.Row();
SCTAB nTab2 = rData.maEnd.Tab();
-// detective arrow
-bool bArrow = pObj-IsPolyObj() (pObj-GetPointCount() == 2);
-
if (rData.meType == ScDrawObjData::ValidationCircle)
{
// Validation circle for detective.
@@ -675,7 +672,7 @@ void ScDrawLayer::RecalcPos( SdrObject* pObj,
ScDrawObjData rData, bool bNegati
pObj-SetLogicRect(rData.maLastRect);
}
}
-else if( bArrow )
+else if (rData.meType == ScDrawObjData::DetectiveArrow)
{
rData.maLastRect = pObj-GetLogicRect();
basegfx::B2DPolygon aCalcPoly;
diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx
index ebf9ef8..9c6d65f 100644
--- a/sc/source/core/tool/detfunc.cxx
+++ b/sc/source/core/tool/detfunc.cxx
@@ -545,16 +545,17 @@ sal_Bool ScDetectiveFunc::InsertArrow( SCCOL nCol, SCROW
nRow,
pPage-InsertObject( pArrow );
pModel-AddCalcUndo( new SdrUndoInsertObj( *pArrow ) );
-ScDrawObjData* pData = ScDrawLayer::GetObjData( pArrow, sal_True );
+ScDrawObjData* pData = ScDrawLayer::GetObjData(pArrow, true);
if (bFromOtherTab)
pData-maStart.SetInvalid();
else
pData-maStart.Set( nRefStartCol, nRefStartRow, nTab);
pData-maEnd.Set( nCol, nRow, nTab);
+pData-meType = ScDrawObjData::DetectiveArrow;
Modified();
-return sal_True;
+return true;
}
sal_Bool ScDetectiveFunc::InsertToOtherTab( SCCOL nStartCol, SCROW nStartRow,
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - sc/inc sc/source
sc/inc/address.hxx |3 ++-
sc/source/core/tool/interpr1.cxx |3 +++
sc/source/ui/view/editsh.cxx |4 ++--
3 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit aeddbade5428ae4794faea79c376f6c8c0e9112f
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sun Jan 8 04:17:53 2012 +0100
don't set document modified for copy and select all, fdo#44423
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 7e7cea0..c843e96 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -233,7 +233,7 @@ void ScEditShell::Execute( SfxRequest rReq )
case SID_COPY:
pTableView-Copy();
-break;
+return;
case SID_CUT:
pTableView-Cut();
@@ -334,7 +334,7 @@ void ScEditShell::Execute( SfxRequest rReq )
pTopView-SetSelection(ESelection(0,0,nPar-1,nLen));
}
}
-break;
+return;
case SID_CHARMAP:
{
commit baed170c416fd5bcae4d17362f0efd0e6284efdc
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sun Jan 8 03:09:34 2012 +0100
return earlier from ScInterpreter::GetDBParams on error, fdo#2
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 34f027d..f54d2a0 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -6609,6 +6609,9 @@ ScDBQueryParamBase* ScInterpreter::GetDBParams( bool
rMissingField )
SetError( errIllegalParameter );
}
+if (nGlobalError)
+return NULL;
+
SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptrScDBRangeBase pDBRef( PopDBDoubleRef() );
SAL_WNODEPRECATED_DECLARATIONS_POP
commit 7922d1d8b65fa18822eaba8d38460d76c1e7a2c8
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sun Jan 8 02:39:53 2012 +0100
limit the number of sheets again to 1
Our 32bit builds have problems to generate more sheets and crash with a
std::bad_alloc
Increase this limit again as soon as we can handle std::bad_alloc
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index c3eb51c..6c45311 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -87,7 +87,8 @@ const SCSIZE SCSIZE_MAX =
::std::numeric_limitsSCSIZE::max();
// Count values
const SCROW MAXROWCOUNT= MAXROWCOUNT_DEFINE;
const SCCOL MAXCOLCOUNT= MAXCOLCOUNT_DEFINE;
-const SCTAB MAXTABCOUNT= 32000;
+// limiting to 1 for now, problem with 32 bit builds for now
+const SCTAB MAXTABCOUNT= 1;
const SCCOLROWMAXCOLROWCOUNT = MAXROWCOUNT;
// Maximum values
const SCROW MAXROW = MAXROWCOUNT - 1;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 4 commits - sc/inc sc/source
sc/inc/address.hxx |3 ++-
sc/source/core/tool/interpr1.cxx |3 +++
sc/source/ui/app/inputhdl.cxx|2 +-
sc/source/ui/view/editsh.cxx |4 ++--
4 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 49f98ec53e928877a85d3dfc2a06161a27ea7fd2
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sat Jan 7 16:55:49 2012 +
another missing null pointer check in multilinebar, fdo#44518
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index c0e3cc6..95d2b7f 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -2115,7 +2115,7 @@ void ScInputHandler::DataChanged( sal_Bool bFromTopNotify
)
if (eMode==SC_INPUT_TYPE || eMode==SC_INPUT_TABLE)
{
String aText;
-if ( pInputWin-IsMultiLineInput() )
+if ( pInputWin pInputWin-IsMultiLineInput() )
aText = ScEditUtil::GetMultilineString(*pEngine);
else
aText = GetEditText(pEngine);
commit 71d55f30ecf972d016a2d02fc3b75c4865bb3d6c
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sun Jan 8 04:17:53 2012 +0100
don't set document modified for copy and select all, fdo#44423
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 7e7cea0..c843e96 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -233,7 +233,7 @@ void ScEditShell::Execute( SfxRequest rReq )
case SID_COPY:
pTableView-Copy();
-break;
+return;
case SID_CUT:
pTableView-Cut();
@@ -334,7 +334,7 @@ void ScEditShell::Execute( SfxRequest rReq )
pTopView-SetSelection(ESelection(0,0,nPar-1,nLen));
}
}
-break;
+return;
case SID_CHARMAP:
{
commit c93098a391fc46f53468ef01a059c17d4f3673ee
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sun Jan 8 03:09:34 2012 +0100
return earlier from ScInterpreter::GetDBParams on error, fdo#2
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index dcdc5fe..8b359aa 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -6609,6 +6609,9 @@ ScDBQueryParamBase* ScInterpreter::GetDBParams( bool
rMissingField )
SetError( errIllegalParameter );
}
+if (nGlobalError)
+return NULL;
+
SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptrScDBRangeBase pDBRef( PopDBDoubleRef() );
SAL_WNODEPRECATED_DECLARATIONS_POP
commit e714bccd83df43a98963e26a85b9d5e28a6c
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sun Jan 8 02:39:53 2012 +0100
limit the number of sheets again to 1
Our 32bit builds have problems to generate more sheets and crash with a
std::bad_alloc
Increase this limit again as soon as we can handle std::bad_alloc
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index 761158d..64f56c7 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -88,7 +88,8 @@ const SCSIZE SCSIZE_MAX =
::std::numeric_limitsSCSIZE::max();
// Count values
const SCROW MAXROWCOUNT= MAXROWCOUNT_DEFINE;
const SCCOL MAXCOLCOUNT= MAXCOLCOUNT_DEFINE;
-const SCTAB MAXTABCOUNT= 32000;
+// limiting to 1 for now, problem with 32 bit builds for now
+const SCTAB MAXTABCOUNT= 1;
const SCCOLROWMAXCOLROWCOUNT = MAXROWCOUNT;
// Maximum values
const SCROW MAXROW = MAXROWCOUNT - 1;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
