[Libreoffice-commits] .: Branch 'update' - check.php
check.php | 19 +--
1 file changed, 5 insertions(+), 14 deletions(-)
New commits:
commit 6c0d90ff343b0e7d5c294d53c20e3b1424d95849
Author: Jan Holesovsky ke...@suse.cz
Date: Fri Apr 6 08:05:15 2012 +0200
3.5.2 RC2 is Final, update everything earlier to that.
diff --git a/check.php b/check.php
index 3b5ad78..e1bff93 100644
--- a/check.php
+++ b/check.php
@@ -105,12 +105,10 @@ $update_versions = array(
# 3.5.1 versions
'45a2874-aa8c38d-dff3b9c-def3dbd-62463c8' = 'LO-3.5', # 3.5.1 RC1
-# To be uncommented when 3.5.2 Final is out
-#'dc9775d-05ecbee-0851ad3-1586698-727bf66' = 'LO-3.5', # 3.5.1 RC2 /
Final
+'dc9775d-05ecbee-0851ad3-1586698-727bf66' = 'LO-3.5', # 3.5.1 RC2 / Final
# 3.5.2 versions
-# -pre to be deleted when 3.5.2 Final is out
-'1488b14-519dc6f-43021d0-52136ea-8d338cc' = 'LO-3.5-pre', # 3.5.2 RC1
+'1488b14-519dc6f-43021d0-52136ea-8d338cc' = 'LO-3.5', # 3.5.2 RC1
# To be uncommented when 3.5.3 Final is out
#'281b639-6baa1d3-ef66a77-d866f25-f36d45f' = 'LO-3.5', # 3.5.2 RC2 /
Final
);
@@ -120,19 +118,12 @@ $update_versions = array(
# 'gitid' is the content of program/versionrc:buildid of the newest version
# 'id' is what is going to be shown in the update information dialog
$update_map = array(
-'LO-3.5' = array('gitid' =
'dc9775d-05ecbee-0851ad3-1586698-727bf66',
- 'id' = 'LibreOffice 3.5.1',
- 'version' = '3.5.1',
+'LO-3.5' = array('gitid' =
'281b639-6baa1d3-ef66a77-d866f25-f36d45f',
+ 'id' = 'LibreOffice 3.5.2',
+ 'version' = '3.5.2',
'update_type' = 'text/html',
'update_src' = 'http://www.libreoffice.org/download/'),
-# To be removed when 3.5.2 RC2 becomes Final
-'LO-3.5-pre' = array('gitid' =
'281b639-6baa1d3-ef66a77-d866f25-f36d45f',
- 'id' = 'LibreOffice 3.5.2 RC2',
- 'version' = '3.5.2 RC2',
- 'update_type' = 'text/html',
- 'update_src' =
'http://www.libreoffice.org/download/pre-releases/'),
-
# To be uncommented when 3.5.3 RC2 is out, to get updates from 3.5.3 RC1
#'LO-3.5-pre' = array('gitid' = '',
# 'id' = 'LibreOffice 3.5.3 RC2',
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 19 ++-
writerfilter/source/rtftok/rtfdocumentimpl.hxx |2 --
2 files changed, 6 insertions(+), 15 deletions(-)
New commits:
commit 1a3ab52289338c4f07fc9fee3f9022be114d2553
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Apr 6 10:07:43 2012 +0200
rtftok: drop m_bIsSubstream, we already have a m_pSuperstream
Originally there was m_bIsSubstream (true for footnotes, headers, etc.),
then we needed a pointer to the original stream, now the boolean value
is redundant, so remove it.
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index e938f98..c244746 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -260,7 +260,6 @@
RTFDocumentImpl::RTFDocumentImpl(uno::Referenceuno::XComponentContext const x
m_aShapetextBuffer(),
m_pCurrentBuffer(0),
m_bHasFootnote(false),
-m_bIsSubstream(false),
m_pSuperstream(0),
m_nHeaderFooterPositions(),
m_nGroupStartPos(0),
@@ -312,11 +311,6 @@ Stream RTFDocumentImpl::Mapper()
return *m_pMapperStream;
}
-void RTFDocumentImpl::setSubstream(bool bIsSubtream)
-{
-m_bIsSubstream = bIsSubtream;
-}
-
void RTFDocumentImpl::setSuperstream(RTFDocumentImpl *pSuperstream)
{
m_pSuperstream = pSuperstream;
@@ -329,7 +323,7 @@ void RTFDocumentImpl::setAuthor(rtl::OUString rAuthor)
bool RTFDocumentImpl::isSubstream() const
{
-return m_bIsSubstream;
+return m_pSuperstream != 0;
}
void RTFDocumentImpl::finishSubstream()
@@ -360,7 +354,6 @@ void RTFDocumentImpl::resolveSubstream(sal_uInt32 nPos, Id
nId, OUString rIgnor
sal_uInt32 nCurrent = Strm().Tell();
// Seek to header position, parse, then seek back.
RTFDocumentImpl::Pointer_t pImpl(new RTFDocumentImpl(m_xContext,
m_xInputStream, m_xDstDoc, m_xFrame, m_xStatusIndicator));
-pImpl-setSubstream(true);
pImpl-setSuperstream(this);
pImpl-setIgnoreFirst(rIgnoreFirst);
if (!m_aAuthor.isEmpty())
@@ -388,7 +381,7 @@ void RTFDocumentImpl::checkFirstRun()
writerfilter::ReferenceTable::Pointer_t const pTable(new
RTFReferenceTable(aSettingsTableEntries));
Mapper().table(NS_ooxml::LN_settings_settings, pTable);
// start initial paragraph
-if (!m_bIsSubstream)
+if (!m_pSuperstream)
Mapper().startSectionGroup();
Mapper().startParagraphGroup();
m_bFirstRun = false;
@@ -499,7 +492,7 @@ void RTFDocumentImpl::sectBreak(bool bFinal = false)
// The trick is that we send properties of the previous section right now,
which will be exactly what dmapper expects.
Mapper().props(pProperties);
Mapper().endParagraphGroup();
-if (!m_bIsSubstream)
+if (!m_pSuperstream)
Mapper().endSectionGroup();
if (!bFinal)
{
@@ -1149,7 +1142,7 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword
nKeyword)
case RTF_FOOTERL:
case RTF_FOOTERR:
case RTF_FOOTERF:
-if (!m_bIsSubstream)
+if (!m_pSuperstream)
{
Id nId = 0;
sal_uInt32 nPos = m_nGroupStartPos - 1;
@@ -1170,7 +1163,7 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword
nKeyword)
}
break;
case RTF_FOOTNOTE:
-if (!m_bIsSubstream)
+if (!m_pSuperstream)
{
Id nId = NS_rtf::LN_footnote;
@@ -1227,7 +1220,7 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword
nKeyword)
m_aStates.top().nDestinationState = DESTINATION_REVISIONTABLE;
break;
case RTF_ANNOTATION:
-if (!m_bIsSubstream)
+if (!m_pSuperstream)
{
resolveSubstream(m_nGroupStartPos - 1, NS_rtf::LN_annotation);
m_aStates.top().nDestinationState = DESTINATION_SKIP;
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 1d72ece..e66f22e 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -441,8 +441,6 @@ namespace writerfilter {
RTFBuffer_t* m_pCurrentBuffer;
bool m_bHasFootnote;
-/// If this is a substream.
-bool m_bIsSubstream;
/// Superstream of this substream.
RTFDocumentImpl *m_pSuperstream;
std::queue std::pairId, sal_uInt32
m_nHeaderFooterPositions;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 6 commits - jurt/CustomTarget_test_urp.mk jurt/JunitTest_urp.mk jurt/Module_jurt.mk jurt/Package_jnilib.mk jurt/Package_test_urp.mk jurt/test jurt/util ridljar/CustomTarget_ja
jurt/CustomTarget_test_urp.mk | 52 +
jurt/JunitTest_urp.mk |4 -
jurt/Module_jurt.mk |8 --
jurt/Package_jnilib.mk| 38 -
jurt/Package_test_urp.mk | 43 --
jurt/test/com/sun/star/lib/uno/protocols/urp/Makefile | 48
jurt/util/Makefile| 38 -
ridljar/CustomTarget_javamaker.mk | 40 ++
ridljar/Jar_ridl.mk |4 -
ridljar/Module_ridljar.mk |2
ridljar/Package_javamaker.mk | 37 -
ridljar/javamaker/Makefile| 39 -
solenv/gbuild/Jar.mk | 12 ++-
solenv/gbuild/JavaClassSet.mk |9 +-
solenv/gbuild/JunitTest.mk| 15 +++
solenv/gbuild/LinkTarget.mk |7 +
unoil/CustomTarget_climaker.mk| 71 ++
unoil/CustomTarget_javamaker.mk | 41 ++
unoil/Jar_unoil.mk|4 -
unoil/Module_unoil.mk |3
unoil/Package_climaker.mk | 15 ---
unoil/Package_javamaker.mk| 38 -
unoil/climaker/Makefile | 64
unoil/javamaker/Makefile | 40 --
unusedcode.easy |3
vcl/inc/vcl/slider.hxx|3
vcl/source/control/slider.cxx | 28 ---
27 files changed, 250 insertions(+), 456 deletions(-)
New commits:
commit 0168b4e6ec645ab3706a1c6104b2aba4a7002536
Author: Matúš Kukan matus.ku...@gmail.com
Date: Fri Apr 6 11:48:57 2012 +0200
make add_custom_headers better
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 996ef9c..cda3f46 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -907,7 +907,7 @@ $(2) :| $(call
gb_LinkTarget_get_external_headers_target,$(1))
endef
-define gb_LinkTarget_add_custom_headers
+define gb_LinkTarget__add_custom_headers
$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : INCLUDE += -I$(call
gb_CustomTarget_get_workdir,$(2))
ifeq ($(gb_FULLDEPS),$(true))
@@ -918,6 +918,11 @@ $(call gb_LinkTarget_get_clean_target,$(1)) : $(call
gb_CustomTarget_get_clean_t
endef
+define gb_LinkTarget_add_custom_headers
+$(foreach customtarget,$(2),$(call
gb_LinkTarget__add_custom_headers,$(1),$(customtarget)))
+
+endef
+
define gb_LinkTarget_add_package_headers
$(foreach package,$(2),$(call gb_LinkTarget__add_internal_headers,$(1),$(call
gb_Package_get_target,$(package
$(call gb_LinkTarget_get_clean_target,$(1)) : $(foreach package,$(2),$(call
gb_Package_get_clean_target,$(package)))
commit 9f92346e7c711786243d41bcd952b61cc922a21f
Author: Thomas Collerton tom.col...@gmail.com
Date: Wed Apr 4 17:10:01 2012 +0200
Remove unused code (vcl)
diff --git a/unusedcode.easy b/unusedcode.easy
index 19586de..91368d3 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -123,9 +123,6 @@ SfxModuleArr_Impl::DeleteAndDestroy(unsigned short,
unsigned short)
SfxNavigatorWrapper::GetChildWindowId()
SfxPartChildWnd_Impl::GetChildWindowId()
SfxRecordingFloatWrapper_Impl::GetChildWindowId()
-Slider::SetRangeMax(long)
-Slider::SetRangeMin(long)
-Slider::Slider(Window*, ResId const)
SotStorage::GetProperty(String const, String const,
com::sun::star::uno::Any)
SpanStyleManager::get(WPXString const) const
SpinButton::SpinButton(Window*, ResId const)
diff --git a/vcl/inc/vcl/slider.hxx b/vcl/inc/vcl/slider.hxx
index 15f0495..c29959c 100644
--- a/vcl/inc/vcl/slider.hxx
+++ b/vcl/inc/vcl/slider.hxx
@@ -88,7 +88,6 @@ private:
public:
Slider( Window* pParent, WinBits nStyle = WB_HORZ );
-Slider( Window* pParent, const ResId rResId );
virtual voidMouseButtonDown( const MouseEvent rMEvt );
virtual voidMouseButtonUp( const MouseEvent rMEvt );
@@ -107,9 +106,7 @@ public:
{ mbFullDrag = bEnable; }
sal_BoolIsDragEnabled() const { return mbFullDrag; }
-voidSetRangeMin( long nNewRange );
longGetRangeMin() const { return mnMinRange; }
-voidSetRangeMax( long nNewRange );
longGetRangeMax() const { return mnMaxRange; }
voidSetRange( const Range rRange );
Range GetRange() const { return Range( GetRangeMin(),
GetRangeMax() ); }
diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx
[Libreoffice-commits] .: avmedia/source basegfx/source canvas/source cui/source dbaccess/source editeng/source filter/source framework/source odk/examples sdext/source sd/source svtools/source svx/sou
avmedia/source/gstreamer/gstframegrabber.cxx |2 +- avmedia/source/gstreamer/gstmanager.cxx |2 +- avmedia/source/gstreamer/gstplayer.cxx |2 +- avmedia/source/gstreamer/gstwindow.cxx |2 +- avmedia/source/win/framegrabber.cxx |2 +- avmedia/source/win/manager.cxx |2 +- avmedia/source/win/player.cxx |2 +- avmedia/source/win/window.cxx |2 +- basegfx/source/tools/unopolypolygon.cxx |2 +- canvas/source/cairo/cairo_canvasbitmap.cxx |2 +- canvas/source/cairo/cairo_canvascustomsprite.cxx |2 +- canvas/source/cairo/cairo_canvasfont.cxx |2 +- canvas/source/cairo/cairo_textlayout.cxx |2 +- canvas/source/directx/dx_canvasbitmap.cxx |2 +- canvas/source/directx/dx_canvascustomsprite.cxx |2 +- canvas/source/directx/dx_canvasfont.cxx |2 +- canvas/source/directx/dx_textlayout.cxx |2 +- canvas/source/null/null_canvasbitmap.cxx |2 +- canvas/source/null/null_canvascustomsprite.cxx |2 +- canvas/source/null/null_canvasfont.cxx |2 +- canvas/source/null/null_textlayout.cxx |2 +- canvas/source/tools/cachedprimitivebase.cxx |2 +- canvas/source/tools/parametricpolypolygon.cxx |2 +- canvas/source/vcl/canvasbitmap.cxx |2 +- canvas/source/vcl/canvascustomsprite.cxx |2 +- canvas/source/vcl/canvasfont.cxx |2 +- canvas/source/vcl/textlayout.cxx |2 +- cui/source/dialogs/colorpicker.cxx |2 +- dbaccess/source/ui/misc/WCopyTable.cxx |2 +- editeng/source/uno/unonrule.cxx |4 ++-- filter/source/filtertracer/filtertracer.cxx |2 +- filter/source/flash/swffilter.cxx |2 +- filter/source/msfilter/powerpoint/pptimporter.cxx |2 +- filter/source/pdf/pdffilter.cxx |2 +- filter/source/pdf/pdfinteract.cxx |2 +- filter/source/placeware/filter.cxx |2 +- filter/source/xmlfilterdetect/filterdetect.cxx |2 +- framework/source/lomenubar/DesktopJob.cxx |2 +- framework/source/lomenubar/FrameJob.cxx |2 +- odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx |2 +- odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx |2 +- odk/examples/cpp/complextoolbarcontrols/MyJob.cxx |2 +- sd/source/filter/html/HtmlOptionsDialog.cxx |2 +- sd/source/ui/unoidl/unomodel.cxx |8 sdext/source/minimizer/pppoptimizer.cxx |2 +- sdext/source/minimizer/pppoptimizerdialog.cxx
[Libreoffice-commits] .: jurt/CustomTarget_jnilib.mk jurt/Module_jurt.mk jurt/Package_jnilib.mk
jurt/CustomTarget_jnilib.mk | 38 ++ jurt/Module_jurt.mk |7 +++ jurt/Package_jnilib.mk | 32 3 files changed, 77 insertions(+) New commits: commit 12b3707ed2ccd77a8fd8b8f341ea035c22d87f40 Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Apr 6 13:05:53 2012 +0200 ops, this should not be deleted diff --git a/jurt/CustomTarget_jnilib.mk b/jurt/CustomTarget_jnilib.mk new file mode 100644 index 000..71d90f6 --- /dev/null +++ b/jurt/CustomTarget_jnilib.mk @@ -0,0 +1,38 @@ +# -*- 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_CustomTarget_CustomTarget,jurt/util,new_style)) + +JUJL := $(call gb_CustomTarget_get_workdir,jurt/util) + +$(call gb_CustomTarget_get_target,jurt/util) : $(JUJL)/libjpipe.jnilib + +$(JUJL)/libjpipe.jnilib : $(call gb_Library_get_target,jpipe) | $(JUJL)/.dir + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MCB,1) + cd $(dir $@) $(SOLARENV)/bin/macosx-create-bundle $ + +# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/jurt/Module_jurt.mk b/jurt/Module_jurt.mk index 0501603..2026de2 100644 --- a/jurt/Module_jurt.mk +++ b/jurt/Module_jurt.mk @@ -35,6 +35,13 @@ $(eval $(call gb_Module_add_targets,jurt,\ Zip_jurt \ )) +ifeq ($(OS),MACOSX) +$(eval $(call gb_Module_add_targets,jurt,\ +CustomTarget_jnilib \ +Package_jnilib \ +)) +endif + ifeq ($(OS),WNT) $(eval $(call gb_Module_add_targets,jurt,\ Library_jpipx \ diff --git a/jurt/Package_jnilib.mk b/jurt/Package_jnilib.mk new file mode 100644 index 000..a728e71 --- /dev/null +++ b/jurt/Package_jnilib.mk @@ -0,0 +1,32 @@ +# -*- 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,jurt_jnilib,$(WORKDIR)/CustomTarget/jurt/util)) + +$(eval $(call gb_Package_add_file,lib/$(patsubst %.dylib,%.jnilib,$(call gb_Library_get_filename,jpipe)),,$(patsubst %.dylib,%.jnilib,$(call gb_Library_get_filename,jpipe + +# vim:set shiftwidth=4 softtabstop=4 expandtab: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: unoil/CustomTarget_climaker.mk
unoil/CustomTarget_climaker.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 501e290b8eb86a31e936e210aeb76d0b8c1a12b3 Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Apr 6 13:15:14 2012 +0200 include variable before it's used diff --git a/unoil/CustomTarget_climaker.mk b/unoil/CustomTarget_climaker.mk index 462a2b8..0e529d0 100644 --- a/unoil/CustomTarget_climaker.mk +++ b/unoil/CustomTarget_climaker.mk @@ -25,6 +25,8 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. +include $(SRCDIR)/unoil/climaker/version.txt + $(eval $(call gb_CustomTarget_CustomTarget,unoil/climaker,new_style)) UICM := $(call gb_CustomTarget_get_workdir,unoil/climaker) @@ -34,8 +36,6 @@ $(call gb_CustomTarget_get_target,unoil/climaker) : \ $(UICM)/cli_oootypes.config \ $(UICM)/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll -include $(SRCDIR)/unoil/climaker/version.txt - $(UICM)/cli_oootypes.dll : $(SRCDIR)/unoil/climaker/version.txt \ $(OUTDIR)/bin/offapi.rdb $(OUTDIR)/bin/udkapi.rdb \ $(OUTDIR)/bin/cliuno.snk $(OUTDIR)/bin/cli_uretypes.dll \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/source
sd/source/ui/view/Outliner.cxx |3 -
sd/source/ui/view/PresentationViewShellBase.cxx |8 +
sd/source/ui/view/ToolBarManager.cxx| 38 ++--
sd/source/ui/view/ViewShellBase.cxx |8 +
sd/source/ui/view/drviews7.cxx |3 -
sd/source/ui/view/drviewsa.cxx |5 +--
sd/source/ui/view/drviewsb.cxx |2 -
sd/source/ui/view/drviewse.cxx | 20 ++--
8 files changed, 37 insertions(+), 50 deletions(-)
New commits:
commit 7d82fb18fe6ae68f6eb6a33c6030105f9e2fe232
Author: Olivier Hallot olivier.hal...@alta.org.br
Date: Fri Apr 6 08:27:05 2012 -0300
Review of some RTL_CONSTASCII_USTRINGPARAM removal
Remove OUString constructor where not needed.
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index d9858b1..e7100e7 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -211,8 +211,7 @@ Outliner::Outliner( SdDrawDocument* pDoc, sal_uInt16 nMode )
const SvtLinguConfigaLinguConfig;
Any aAny;
-aAny = aLinguConfig.GetProperty(
-rtl::OUString( UPN_IS_SPELL_AUTO ) );
+aAny = aLinguConfig.GetProperty( UPN_IS_SPELL_AUTO );
aAny = bOnlineSpell;
}
catch( ... )
diff --git a/sd/source/ui/view/PresentationViewShellBase.cxx
b/sd/source/ui/view/PresentationViewShellBase.cxx
index 8c7315f..bd43160 100644
--- a/sd/source/ui/view/PresentationViewShellBase.cxx
+++ b/sd/source/ui/view/PresentationViewShellBase.cxx
@@ -85,14 +85,10 @@ PresentationViewShellBase::PresentationViewShellBase (
UNO_QUERY);
if (xFrameSet.is())
{
-Referencebeans::XPropertySet xLayouterSet (
-xFrameSet-getPropertyValue(::rtl::OUString(LayoutManager)),
-UNO_QUERY);
+Referencebeans::XPropertySet
xLayouterSet(xFrameSet-getPropertyValue(LayoutManager), UNO_QUERY);
if (xLayouterSet.is())
{
-xLayouterSet-setPropertyValue(
-::rtl::OUString(AutomaticToolbars),
-makeAny(sal_False));
+xLayouterSet-setPropertyValue(AutomaticToolbars,
makeAny(sal_False));
}
}
}
diff --git a/sd/source/ui/view/ToolBarManager.cxx
b/sd/source/ui/view/ToolBarManager.cxx
index 4d1ef89..7b89cf5 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -58,9 +58,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-#undef OUSTRING // Remove definition made in the SFX
-#define OUSTRING(s) (::rtl::OUString(s))
-
namespace {
using namespace sd;
@@ -359,21 +356,21 @@ private:
//= ToolBarManager
-const ::rtl::OUString ToolBarManager::msToolBar(OUSTRING(toolbar));
-const ::rtl::OUString ToolBarManager::msOptionsToolBar(OUSTRING(optionsbar));
-const ::rtl::OUString
ToolBarManager::msCommonTaskToolBar(OUSTRING(commontaskbar));
-const ::rtl::OUString ToolBarManager::msViewerToolBar(OUSTRING(viewerbar));
-const ::rtl::OUString
ToolBarManager::msSlideSorterToolBar(OUSTRING(slideviewtoolbar));
-const ::rtl::OUString
ToolBarManager::msSlideSorterObjectBar(OUSTRING(slideviewobjectbar));
-const ::rtl::OUString
ToolBarManager::msOutlineToolBar(OUSTRING(outlinetoolbar));
-const ::rtl::OUString
ToolBarManager::msMasterViewToolBar(OUSTRING(masterviewtoolbar));
-const ::rtl::OUString
ToolBarManager::msDrawingObjectToolBar(OUSTRING(drawingobjectbar));
-const ::rtl::OUString
ToolBarManager::msGluePointsToolBar(OUSTRING(gluepointsobjectbar));
-const ::rtl::OUString
ToolBarManager::msTextObjectBar(OUSTRING(textobjectbar));
-const ::rtl::OUString
ToolBarManager::msBezierObjectBar(OUSTRING(bezierobjectbar));
-const ::rtl::OUString
ToolBarManager::msGraphicObjectBar(OUSTRING(graphicobjectbar));
-const ::rtl::OUString
ToolBarManager::msMediaObjectBar(OUSTRING(mediaobjectbar));
-const ::rtl::OUString
ToolBarManager::msTableObjectBar(OUSTRING(tableobjectbar));
+const ::rtl::OUString ToolBarManager::msToolBar(toolbar);
+const ::rtl::OUString ToolBarManager::msOptionsToolBar(optionsbar);
+const ::rtl::OUString ToolBarManager::msCommonTaskToolBar(commontaskbar);
+const ::rtl::OUString ToolBarManager::msViewerToolBar(viewerbar);
+const ::rtl::OUString ToolBarManager::msSlideSorterToolBar(slideviewtoolbar);
+const ::rtl::OUString
ToolBarManager::msSlideSorterObjectBar(slideviewobjectbar);
+const ::rtl::OUString ToolBarManager::msOutlineToolBar(outlinetoolbar);
+const ::rtl::OUString ToolBarManager::msMasterViewToolBar(masterviewtoolbar);
+const ::rtl::OUString
ToolBarManager::msDrawingObjectToolBar(drawingobjectbar);
+const ::rtl::OUString
ToolBarManager::msGluePointsToolBar(gluepointsobjectbar);
+const ::rtl::OUString
[Libreoffice-commits] .: sal/inc sal/qa sal/rtl
sal/inc/rtl/strbuf.hxx | 54 +++
sal/inc/rtl/string.h|3
sal/inc/rtl/string.hxx |4 -
sal/inc/rtl/ustrbuf.hxx | 69
sal/inc/rtl/ustring.h | 15 +---
sal/inc/rtl/ustring.hxx | 12 +--
sal/qa/rtl/strings/test_ostring_stringliterals.cxx |6 +
sal/qa/rtl/strings/test_oustring_stringliterals.cxx | 21 +++---
sal/rtl/source/strtmpl.cxx | 11 ++-
9 files changed, 162 insertions(+), 33 deletions(-)
New commits:
commit 066dbfd1970b8ea58ba16b07b2a57f61c0cb8e36
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Fri Apr 6 13:45:47 2012 +0200
string literal O(U)StringBuffer ctors too, after all
diff --git a/sal/inc/rtl/strbuf.hxx b/sal/inc/rtl/strbuf.hxx
index 122eb4b..4500cf0 100644
--- a/sal/inc/rtl/strbuf.hxx
+++ b/sal/inc/rtl/strbuf.hxx
@@ -155,6 +155,60 @@ public:
}
/**
+@overload
+@since LibreOffice 3.6
+ */
+#ifdef HAVE_SFINAE_ANONYMOUS_BROKEN // see the OString ctors
+OStringBuffer( const char* value )
+: pData(NULL)
+{
+sal_Int32 length = rtl_str_getLength( value );
+nCapacity = length + 16;
+rtl_stringbuffer_newFromStr_WithLength( pData, value, length );
+}
+#else
+template typename T
+OStringBuffer( const T value, typename internal::CharPtrDetector T,
internal::Dummy ::Type = internal::Dummy())
+: pData(NULL)
+{
+sal_Int32 length = rtl_str_getLength( value );
+nCapacity = length + 16;
+rtl_stringbuffer_newFromStr_WithLength( pData, value, length );
+}
+
+template typename T
+OStringBuffer( T value, typename internal::NonConstCharArrayDetector T,
internal::Dummy ::Type = internal::Dummy())
+: pData(NULL)
+{
+sal_Int32 length = rtl_str_getLength( value );
+nCapacity = length + 16;
+rtl_stringbuffer_newFromStr_WithLength( pData, value, length );
+}
+
+/**
+ Constructs a string buffer so that it represents the same
+sequence of characters as the string literal.
+
+ If there are any embedded \0's in the string literal, the result is
undefined.
+ Use the overload that explicitly accepts length.
+
+ @since LibreOffice 3.6
+
+ @paramliteral a string literal
+*/
+template typename T
+OStringBuffer( T literal, typename internal::ConstCharArrayDetector T,
internal::Dummy ::Type = internal::Dummy())
+: pData(NULL)
+, nCapacity( internal::ConstCharArrayDetector T, void ::size - 1 +
16 )
+{
+rtl_string_newFromLiteral( pData, literal,
internal::ConstCharArrayDetector T, void ::size - 1, 16 );
+#ifdef RTL_STRING_UNITTEST
+rtl_string_unittest_const_literal = true;
+#endif
+}
+#endif // HAVE_SFINAE_ANONYMOUS_BROKEN
+
+/**
Constructs a string buffer so that it represents the same
sequence of characters as the string argument.
diff --git a/sal/inc/rtl/string.h b/sal/inc/rtl/string.h
index f695c12..f326abe 100644
--- a/sal/inc/rtl/string.h
+++ b/sal/inc/rtl/string.h
@@ -888,8 +888,9 @@ SAL_DLLPUBLIC void SAL_CALL
rtl_string_newFromStr_WithLength( rtl_String ** newS
/**
@internal
+ @since LibreOffice 3.6
*/
-SAL_DLLPUBLIC void SAL_CALL rtl_string_newFromLiteral( rtl_String ** newStr,
const sal_Char * value, sal_Int32 len ) SAL_THROW_EXTERN_C();
+SAL_DLLPUBLIC void SAL_CALL rtl_string_newFromLiteral( rtl_String ** newStr,
const sal_Char * value, sal_Int32 len, sal_Int32 allocExtra )
SAL_THROW_EXTERN_C();
/** Assign a new value to a string.
diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index 0f6246b..9791a8c 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -206,7 +206,7 @@ public:
OString( T literal, typename internal::ConstCharArrayDetector T,
internal::Dummy ::Type = internal::Dummy() ) SAL_THROW(())
{
pData = 0;
-rtl_string_newFromLiteral( pData, literal,
internal::ConstCharArrayDetector T, void ::size - 1 );
+rtl_string_newFromLiteral( pData, literal,
internal::ConstCharArrayDetector T, void ::size - 1, 0 );
#ifdef RTL_STRING_UNITTEST
rtl_string_unittest_const_literal = true;
#endif
@@ -285,7 +285,7 @@ public:
typename internal::ConstCharArrayDetector T, OString ::Type operator=(
T literal ) SAL_THROW(())
{
RTL_STRING_CONST_FUNCTION
-rtl_string_newFromLiteral( pData, literal,
internal::ConstCharArrayDetector T, void ::size - 1 );
+rtl_string_newFromLiteral( pData, literal,
internal::ConstCharArrayDetector T, void ::size - 1, 0 );
return *this;
}
diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx
index 02a507c..17deadd 100644
--- a/sal/inc/rtl/ustrbuf.hxx
+++ b/sal/inc/rtl/ustrbuf.hxx
@@ -149,6 +149,75 @@
[Libreoffice-commits] .: sal/inc
sal/inc/rtl/strbuf.hxx |2 +-
sal/inc/rtl/ustrbuf.hxx |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit d91d98a53612a972de368186415aa48698e074d9
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Fri Apr 6 15:08:02 2012 +0200
fix gcc-4.0.1 and/or 32bit build for string literals
Plain 0 is ambiguous to convert to either long or const char*,
and just adding an overload next to sal_Int32 would be a dupe if
they actually are the same type, so just go with plain int, which
is the sensible thing to do anyway.
diff --git a/sal/inc/rtl/strbuf.hxx b/sal/inc/rtl/strbuf.hxx
index 4500cf0..7711308 100644
--- a/sal/inc/rtl/strbuf.hxx
+++ b/sal/inc/rtl/strbuf.hxx
@@ -130,7 +130,7 @@ public:
@param length the initial capacity.
*/
-explicit OStringBuffer(sal_Int32 length)
+explicit OStringBuffer(int length)
: pData(NULL)
, nCapacity( length )
{
diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx
index 17deadd..a887107 100644
--- a/sal/inc/rtl/ustrbuf.hxx
+++ b/sal/inc/rtl/ustrbuf.hxx
@@ -125,7 +125,7 @@ public:
@param length the initial capacity.
*/
-explicit OUStringBuffer(sal_Int32 length)
+explicit OUStringBuffer(int length)
: pData(NULL)
, nCapacity( length )
{
@@ -155,7 +155,7 @@ public:
: pData(NULL)
, nCapacity( N - 1 + 16 )
{
-rtl_uStringbuffer_newFromStr_WithLength( pData, literal, N - 1 );
+rtl_uString_newFromLiteral( pData, literal, N - 1, 16 );
#ifdef RTL_STRING_UNITTEST
rtl_string_unittest_const_literal = true;
#endif
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |7 +++
1 file changed, 7 insertions(+)
New commits:
commit 2ff3c94c471ee586c733121e528e9623c4344224
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Tue Dec 20 16:27:46 2011 +0100
fdo#47036 n#703032 RTF/DOCX import: fixed the import of consecutive frames
When we have two consecutive paragraphs with different frame properties,
the second frame wasn't created. Now store the current paragraph
properties in order to create the frame later.
(cherry picked from commit e040d2931658b411bfbd1c668dc96422374a74be)
Signed-off-by: Miklos Vajna vmik...@suse.cz
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index bc38966..5461a99 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1010,6 +1010,13 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr
pPropertyMap )
{
//handles (8)(9) and completes (6)
CheckUnregisteredFrameConversion( );
+
+// If different frame properties are set on this
paragraph, keep them.
+if ( !bIsDropCap pParaContext-IsFrameMode() )
+{
+pToBeSavedProperties.reset( new
ParagraphProperties(*pParaContext) );
+lcl_AddRangeAndStyle(pToBeSavedProperties,
xTextAppend, pPropertyMap);
+}
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/qa
sal/qa/rtl/strings/test_ostring_stringliterals.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 2dde3c3ebb8e66535bb9d9d50c5494323d2bc876 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Fri Apr 6 16:15:09 2012 +0200 reset the flag before checking it it will be set again diff --git a/sal/qa/rtl/strings/test_ostring_stringliterals.cxx b/sal/qa/rtl/strings/test_ostring_stringliterals.cxx index 2baac11..3bed05a 100644 --- a/sal/qa/rtl/strings/test_ostring_stringliterals.cxx +++ b/sal/qa/rtl/strings/test_ostring_stringliterals.cxx @@ -84,6 +84,7 @@ CPPUNIT_TEST_SUITE_END(); rtl_string_unittest_const_literal = false, \ ( void ) rtl::OString( argument ), \ result_tmp = rtl_string_unittest_const_literal, \ +rtl_string_unittest_const_literal = false, \ ( void ) rtl::OStringBuffer( argument ), \ rtl_string_unittest_const_literal result_tmp ) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - io/Makefile solenv/gbuild stoc/Makefile
io/Makefile | 37 ++--- solenv/gbuild/UnoApiTarget.mk |2 +- stoc/Makefile | 37 ++--- 3 files changed, 5 insertions(+), 71 deletions(-) New commits: commit 2c1d6b2fdee1e3572769146d77addbccea7bc513 Author: David Tardon dtar...@redhat.com Date: Fri Apr 6 16:48:42 2012 +0200 fix makefiles diff --git a/io/Makefile b/io/Makefile index 7bbbe6c..ccb1c85 100644 --- a/io/Makefile +++ b/io/Makefile @@ -1,40 +1,7 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -#* -# -# 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. -# -#* -gb_PARTIALBUILD := T -ifeq ($(strip $(SOLARENV)),) -include $(dir $(realpath $(firstword $(MAKEFILE_LIST/../solenv/gbuild/source_and_rerun.mk -else +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST -gb_SourceEnvAndRecurse_STAGE=gbuild -include $(SOLARENV)/gbuild/gbuild.mk +include $(module_directory)/../solenv/gbuild/partial_build.mk -$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST/Module*.mk))) - -endif # vim: set noet sw=4 ts=4: diff --git a/stoc/Makefile b/stoc/Makefile index 7bbbe6c..ccb1c85 100644 --- a/stoc/Makefile +++ b/stoc/Makefile @@ -1,40 +1,7 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -#* -# -# 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. -# -#* -gb_PARTIALBUILD := T -ifeq ($(strip $(SOLARENV)),) -include $(dir $(realpath $(firstword $(MAKEFILE_LIST/../solenv/gbuild/source_and_rerun.mk -else +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST -gb_SourceEnvAndRecurse_STAGE=gbuild -include $(SOLARENV)/gbuild/gbuild.mk +include $(module_directory)/../solenv/gbuild/partial_build.mk -$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST/Module*.mk))) - -endif # vim: set noet sw=4 ts=4: commit 565707cda484b10c1809525df1670b378f9a61f8 Author: David Tardon dtar...@redhat.com Date: Fri Apr 6 16:48:31 2012 +0200 fix build on windows (i hope) diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index d2adfe9..8192d26 100644 --- a/solenv/gbuild/UnoApiTarget.mk +++ b/solenv/gbuild/UnoApiTarget.mk @@ -91,7 +91,7 @@ gb_UnoApiTarget_XML2CMPCOMMAND := $(gb_Helper_set_ld_path) $(gb_UnoApiTarget_XML gb_UnoApiTarget_XMLRDB := $(call gb_UnoApiTarget_get_target,types) define gb_UnoApiTarget__get_types -$(if $(1),$(foreach type,$(shell $(gb_UnoApiTarget_XML2CMPCOMMAND) -types stdout $(1)),$(addprefix -T,$(type +$(if $(1),$(foreach type,$(shell $(gb_UnoApiTarget_XML2CMPCOMMAND) -types stdout $(call gb_Helper_native_path,$(1))),$(addprefix -T,$(type endef define gb_UnoApiTarget__command_impl
[Libreoffice-commits] .: sw/qa
sw/qa/extras/ooxmltok/data/n751017.docx |binary
sw/qa/extras/ooxmltok/ooxmltok.cxx | 52
2 files changed, 52 insertions(+)
New commits:
commit 46e7e5a505ddc2933316ba1d42895155a26e8b67
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Apr 6 16:55:34 2012 +0200
n#751017 testcase
diff --git a/sw/qa/extras/ooxmltok/data/n751017.docx
b/sw/qa/extras/ooxmltok/data/n751017.docx
new file mode 100644
index 000..cdd81cf
Binary files /dev/null and b/sw/qa/extras/ooxmltok/data/n751017.docx differ
diff --git a/sw/qa/extras/ooxmltok/ooxmltok.cxx
b/sw/qa/extras/ooxmltok/ooxmltok.cxx
index 364d66d..5beb577 100644
--- a/sw/qa/extras/ooxmltok/ooxmltok.cxx
+++ b/sw/qa/extras/ooxmltok/ooxmltok.cxx
@@ -28,7 +28,10 @@
#include com/sun/star/beans/XPropertySet.hpp
#include com/sun/star/drawing/XDrawPageSupplier.hpp
#include com/sun/star/lang/XServiceInfo.hpp
+#include com/sun/star/text/SetVariableType.hpp
#include com/sun/star/text/TextContentAnchorType.hpp
+#include com/sun/star/text/XDependentTextField.hpp
+#include com/sun/star/text/XTextFieldsSupplier.hpp
#include test/bootstrapfixture.hxx
#include unotest/macros_test.hxx
@@ -46,11 +49,13 @@ public:
virtual void tearDown();
void testN751054();
void testN751117();
+void testN751017();
CPPUNIT_TEST_SUITE(OoxmlModelTest);
#if !defined(MACOSX) !defined(WNT)
CPPUNIT_TEST(testN751054);
CPPUNIT_TEST(testN751117);
+CPPUNIT_TEST(testN751017);
#endif
CPPUNIT_TEST_SUITE_END();
@@ -119,6 +124,53 @@ void OoxmlModelTest::testN751117()
CPPUNIT_ASSERT(xServiceInfo-supportsService(com.sun.star.drawing.LineShape));
}
+void OoxmlModelTest::testN751017()
+{
+load(n751017.docx);
+uno::Referencetext::XTextFieldsSupplier xTextFieldsSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XNameAccess
xMasters(xTextFieldsSupplier-getTextFieldMasters());
+// Make sure we have a variable named foo.
+
CPPUNIT_ASSERT(xMasters-hasByName(com.sun.star.text.FieldMaster.SetExpression.foo));
+
+uno::Referencecontainer::XEnumerationAccess
xFieldsAccess(xTextFieldsSupplier-getTextFields());
+uno::Referencecontainer::XEnumeration
xFields(xFieldsAccess-createEnumeration());
+bool bFoundSet(false), bFoundGet(false);
+while (xFields-hasMoreElements())
+{
+uno::Referencelang::XServiceInfo
xServiceInfo(xFields-nextElement(), uno::UNO_QUERY);
+uno::Referencebeans::XPropertySet xPropertySet(xServiceInfo,
uno::UNO_QUERY);
+sal_Int16 nValue = 0;
+OUString aValue;
+if
(xServiceInfo-supportsService(com.sun.star.text.TextField.SetExpression))
+{
+bFoundSet = true;
+uno::Referencetext::XDependentTextField
xDependentTextField(xServiceInfo, uno::UNO_QUERY);
+uno::Referencebeans::XPropertySet
xMasterProps(xDependentTextField-getTextFieldMaster());
+
+// First step: did we set foo to bar?
+xMasterProps-getPropertyValue(Name) = aValue;
+CPPUNIT_ASSERT_EQUAL(OUString(foo), aValue);
+xPropertySet-getPropertyValue(SubType) = nValue;
+CPPUNIT_ASSERT_EQUAL(text::SetVariableType::STRING, nValue);
+xPropertySet-getPropertyValue(Content) = aValue;
+CPPUNIT_ASSERT_EQUAL(OUString(bar), aValue);
+}
+else if
(xServiceInfo-supportsService(com.sun.star.text.TextField.GetExpression))
+{
+// Second step: check the value of foo.
+bFoundGet = true;
+xPropertySet-getPropertyValue(Content) = aValue;
+CPPUNIT_ASSERT_EQUAL(OUString(foo), aValue);
+xPropertySet-getPropertyValue(SubType) = nValue;
+CPPUNIT_ASSERT_EQUAL(text::SetVariableType::STRING, nValue);
+xPropertySet-getPropertyValue(CurrentPresentation) = aValue;
+CPPUNIT_ASSERT_EQUAL(OUString(bar), aValue);
+}
+}
+CPPUNIT_ASSERT(bFoundSet);
+CPPUNIT_ASSERT(bFoundGet);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(OoxmlModelTest);
CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: jurt/CustomTarget_test_urp.mk
jurt/CustomTarget_test_urp.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b33134d246a49cab13bbeb6c95f862faf0a69268 Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Apr 6 19:18:45 2012 +0200 fix build of jurt_urp diff --git a/jurt/CustomTarget_test_urp.mk b/jurt/CustomTarget_test_urp.mk index 725cae6..73f6fad 100644 --- a/jurt/CustomTarget_test_urp.mk +++ b/jurt/CustomTarget_test_urp.mk @@ -47,6 +47,6 @@ $(JUTU)/registry.rdb : $(JUTU)/interfaces.urd \ $(JUTU)/interfaces.urd : $(SRCDIR)/jurt/test/com/sun/star/lib/uno/protocols/urp/interfaces.idl \ $(call gb_Executable_get_target_for_build,idlc) | $(JUTU)/urd/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),IDL,1) - $(call gb_Helper_execute,idlc -O$(JUTU)/urd -I$(OUTDIR)/idl -cid -we $) + $(call gb_Helper_execute,idlc -O$(JUTU) -I$(OUTDIR)/idl -cid -we $) # vim:set shiftwidth=4 tabstop=4 noexpandtab: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: stoc/Library_javaloader.mk
stoc/Library_javaloader.mk |1 + 1 file changed, 1 insertion(+) New commits: commit ff496d9124b44c763cae2d45fe337e75781b743c Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Apr 6 20:02:04 2012 +0200 javaloader: add_linked_lib salhelper diff --git a/stoc/Library_javaloader.mk b/stoc/Library_javaloader.mk index e0f1a13..8c672d2 100644 --- a/stoc/Library_javaloader.mk +++ b/stoc/Library_javaloader.mk @@ -46,6 +46,7 @@ $(eval $(call gb_Library_add_linked_libs,javaloader,\ cppuhelper \ jvmaccess \ sal \ +salhelper \ $(gb_STDLIBS) \ )) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cui/source editeng/inc editeng/source sw/source
cui/source/tabpages/numpages.cxx |3 +--
editeng/inc/editeng/numitem.hxx |8
editeng/source/items/numitem.cxx |4 ++--
sw/source/filter/rtf/rtfnum.cxx |2 +-
sw/source/filter/ww8/ww8par3.cxx |2 +-
sw/source/ui/misc/num.cxx|3 +--
6 files changed, 10 insertions(+), 12 deletions(-)
New commits:
commit 837aa67861275dd56831cbba03a989b5ad71db4b
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Wed Apr 4 21:11:26 2012 +0200
reduce overzealous naming
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index e85b5fd..bf9b1f2 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -3364,8 +3364,7 @@ IMPL_LINK( SvxNumPositionTabPage, RelativeHdl_Impl,
CheckBox *, pBox )
IMPL_LINK_NOARG(SvxNumPositionTabPage, LabelFollowedByHdl_Impl)
{
// determine value to be set at the chosen list levels
-SvxNumberFormat::SvxNumLabelFollowedBy eLabelFollowedBy =
-SvxNumberFormat::LISTTAB;
+SvxNumberFormat::LabelFollowedBy eLabelFollowedBy =
SvxNumberFormat::LISTTAB;
{
const sal_uInt16 nPos = aLabelFollowedByLB.GetSelectEntryPos();
if ( nPos == 1 )
diff --git a/editeng/inc/editeng/numitem.hxx b/editeng/inc/editeng/numitem.hxx
index cf7d344..a6ef8e6 100644
--- a/editeng/inc/editeng/numitem.hxx
+++ b/editeng/inc/editeng/numitem.hxx
@@ -109,7 +109,7 @@ public:
LABEL_WIDTH_AND_POSITION,
LABEL_ALIGNMENT
};
-enum SvxNumLabelFollowedBy
+enum LabelFollowedBy
{
LISTTAB,
SPACE,
@@ -147,7 +147,7 @@ private:
// specifies what follows the list label before the text of the first line
// of the list item starts
-SvxNumLabelFollowedBy meLabelFollowedBy;
+LabelFollowedBy meLabelFollowedBy;
// specifies an additional list tab stop position for meLabelFollowedBy =
LISTTAB
longmnListtabPos;
// specifies the first line indent
@@ -224,8 +224,8 @@ public:
voidSetCharTextDistance(short nSet) { nCharTextDistance =
nSet; }
short GetCharTextDistance() const;
-void SetLabelFollowedBy( const SvxNumLabelFollowedBy eLabelFollowedBy );
-SvxNumLabelFollowedBy GetLabelFollowedBy() const;
+void SetLabelFollowedBy( const LabelFollowedBy eLabelFollowedBy );
+LabelFollowedBy GetLabelFollowedBy() const;
void SetListtabPos( const long nListtabPos );
long GetListtabPos() const;
void SetFirstLineIndent( const long nFirstLineIndent );
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 7346805..fc081b2 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -438,11 +438,11 @@ short SvxNumberFormat::GetCharTextDistance() const
return mePositionAndSpaceMode == LABEL_WIDTH_AND_POSITION ?
nCharTextDistance : 0;
}
-void SvxNumberFormat::SetLabelFollowedBy( const SvxNumLabelFollowedBy
eLabelFollowedBy )
+void SvxNumberFormat::SetLabelFollowedBy( const LabelFollowedBy
eLabelFollowedBy )
{
meLabelFollowedBy = eLabelFollowedBy;
}
-SvxNumberFormat::SvxNumLabelFollowedBy SvxNumberFormat::GetLabelFollowedBy()
const
+SvxNumberFormat::LabelFollowedBy SvxNumberFormat::GetLabelFollowedBy() const
{
return meLabelFollowedBy;
}
diff --git a/sw/source/filter/rtf/rtfnum.cxx b/sw/source/filter/rtf/rtfnum.cxx
index da74753..39218c4 100644
--- a/sw/source/filter/rtf/rtfnum.cxx
+++ b/sw/source/filter/rtf/rtfnum.cxx
@@ -67,7 +67,7 @@ void SwRTFParser::ReadListLevel( SwNumRule rRule, sal_uInt8
nNumLvl )
int nLvlTxtLevel = 0, nLvlNumberLevel = 0;
String sLvlText, sLvlNumber;
SwNumFmt* pCurNumFmt;
-SvxNumberFormat::SvxNumLabelFollowedBy eFollowedBy =
SvxNumberFormat::NOTHING;
+SvxNumberFormat::LabelFollowedBy eFollowedBy = SvxNumberFormat::NOTHING;
if( MAXLEVEL = nNumLvl )
{
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index f50f321..4a39b5d 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -904,7 +904,7 @@ bool WW8ListManager::ReadLVL(SwNumFmt rNumFmt,
SfxItemSet* rpItemSet,
rNumFmt.SetListtabPos( nTabPos );
else
rNumFmt.SetListtabPos( aLVL.nV6Indent );
-SvxNumberFormat::SvxNumLabelFollowedBy eNumLabelFollowedBy =
SvxNumberFormat::LISTTAB;
+SvxNumberFormat::LabelFollowedBy eNumLabelFollowedBy =
SvxNumberFormat::LISTTAB;
switch ( ixchFollow )
{
case 0:
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 7fa8388..80a6173 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -743,8 +743,7 @@ IMPL_LINK( SwNumPositionTabPage, RelativeHdl, CheckBox *,
pBox )
IMPL_LINK_NOARG(SwNumPositionTabPage, LabelFollowedByHdl_Impl)
{
// determine value to be set at the chosen list levels
-
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sfx2/source
sfx2/source/dialog/filedlghelper.cxx | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
New commits:
commit cac9cf690bf337a97ede781c38c5e7ddb3f37ca5
Author: Michael Stahl mst...@redhat.com
Date: Thu Apr 5 18:09:41 2012 +0200
fdo#43895 lp#905355: fix the fix so it doesn't crash
rtl::OUString rtl::OUString::copy(sal_Int32) const: Assertion
`beginIndex = 0 beginIndex = getLength()' failed.
(regression from dd2fe95cce75f1157bd1c75d286a0047b2e4175e)
Signed-off-by: Bjoern Michaelsen bjoern.michael...@canonical.com
diff --git a/sfx2/source/dialog/filedlghelper.cxx
b/sfx2/source/dialog/filedlghelper.cxx
index 79c1e4e..6acb006 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -1654,8 +1654,17 @@ void FileDialogHelper_Impl::getRealFilter( String
_rFilter ) const
void FileDialogHelper_Impl::verifyPath()
{
#ifdef UNX
+static char const s_FileScheme[] = file://;
+if (0 != rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength(
+maPath.getStr(), maPath.getLength(),
+s_FileScheme, RTL_CONSTASCII_LENGTH(s_FileScheme)))
+{
+return;
+}
+const OString sFullPath = OUStringToOString(
+maPath.copy(RTL_CONSTASCII_LENGTH(s_FileScheme)) + maFileName,
+osl_getThreadTextEncoding() );
struct stat aFileStat;
-const OString sFullPath = OUStringToOString(
maPath.copy(RTL_CONSTASCII_LENGTH(file://)) + maFileName,
osl_getThreadTextEncoding() );
stat( sFullPath.getStr(), aFileStat );
// lp#905355, fdo#43895
// Check that the file has read only permission and is in /tmp -- this is
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild solenv/inc
solenv/gbuild/platform/WNT_INTEL_GCC.mk |2 ++ solenv/gbuild/platform/com_GCC_defs.mk |2 ++ solenv/inc/unxgcc.mk|2 ++ solenv/inc/unxiosr.mk |2 ++ solenv/inc/unxmacx.mk |2 ++ solenv/inc/wntgcci.mk |5 - 6 files changed, 14 insertions(+), 1 deletion(-) New commits: commit cdd0e1810d4019d827563b436c1b3b8d1cf5b579 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Fri Apr 6 21:29:43 2012 +0200 enable -fno-enforce-eh-specs only for non-dbgutil builds The code uses exception specifications, so it doesn't make much sense to have them, but disable them using a gcc option. MSVC ignores them completely, so this would leave only clang as the only compiler to enforce them. Either the majority compiler needs to enforce it at least in dbgutil builds (in product builds the option can be seen as a kind of NDEBUG), or alternatively the exception specifications should be removed. diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index 1ba676f..08b5351 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -93,8 +93,10 @@ ifeq ($(HAVE_CXX0X),TRUE) # FIXME still does not compile fully gb_CXXFLAGS += -std=gnu++0x endif +ifeq ($(gb_PRODUCT),$(true)) gb_LinkTarget_EXCEPTIONFLAGS += \ -fno-enforce-eh-specs \ +endif # At least sal defines its own __main, which would cause DLLs linking against # sal to pick up sal's __main instead of the one from MinGW's dllcrt2.o: diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 4018ebc..c025e70 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -120,11 +120,13 @@ gb_LinkTarget_EXCEPTIONFLAGS := \ -DEXCEPTIONS_ON \ -fexceptions +ifeq ($(gb_PRODUCT),$(true)) # Clang doesn't have this option ifneq ($(COM_GCC_IS_CLANG),TRUE) gb_LinkTarget_EXCEPTIONFLAGS += \ -fno-enforce-eh-specs endif +endif gb_LinkTarget_NOEXCEPTIONFLAGS := \ -DEXCEPTIONS_OFF \ diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk index 4f9ebee..151fc8b 100644 --- a/solenv/inc/unxgcc.mk +++ b/solenv/inc/unxgcc.mk @@ -83,9 +83,11 @@ CFLAGSENABLESYMBOLS=-g CFLAGSCC= -pipe $(ARCH_FLAGS) # Flags for enabling exception handling CFLAGSEXCEPTIONS=-fexceptions +.IF $(dbgutil)== .IF $(COM_GCC_IS_CLANG) != TRUE CFLAGSEXCEPTIONS+=-fno-enforce-eh-specs .ENDIF +.ENDIF # Flags for disabling exception handling CFLAGS_NO_EXCEPTIONS=-fno-exceptions diff --git a/solenv/inc/unxiosr.mk b/solenv/inc/unxiosr.mk index 05bded5..089dc3d 100644 --- a/solenv/inc/unxiosr.mk +++ b/solenv/inc/unxiosr.mk @@ -53,9 +53,11 @@ OBJCXXFLAGS:=-x objective-c++ $(OBJCFLAGS) # Comp Flags for files that need exceptions enabled (C and C++) CFLAGSEXCEPTIONS=-fexceptions +.IF $(dbgutil)== .IF $(COM_GCC_IS_CLANG) != TRUE CFLAGSEXCEPTIONS+=-fno-enforce-eh-specs .ENDIF +.ENDIF # Comp Flags for files that do not need exceptions enabled (C and C++) CFLAGS_NO_EXCEPTIONS=-fno-exceptions diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk index 8f36772..c829a45 100644 --- a/solenv/inc/unxmacx.mk +++ b/solenv/inc/unxmacx.mk @@ -107,9 +107,11 @@ OBJCXXFLAGS=-x objective-c++ -fobjc-exceptions # Comp Flags for files that need exceptions enabled (C and C++) CFLAGSEXCEPTIONS=-fexceptions +.IF $(dbgutil)== .IF $(COM_GCC_IS_CLANG) != TRUE CFLAGSEXCEPTIONS+=-fno-enforce-eh-specs .ENDIF +.ENDIF # Comp Flags for files that do not need exceptions enabled (C and C++) CFLAGS_NO_EXCEPTIONS=-fno-exceptions diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk index bdf46b4..c8e39d1 100644 --- a/solenv/inc/wntgcci.mk +++ b/solenv/inc/wntgcci.mk @@ -51,8 +51,11 @@ CFLAGSCXX=-pipe $(ARCH_FLAGS) # FIXME still does not compile fully CFLAGSCXX+=-std=gnu++0x .ENDIF -CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs +CFLAGSEXCEPTIONS=-fexceptions CFLAGS_NO_EXCEPTIONS=-fno-exceptions +.IF $(dbgutil)== +CFLAGSEXCEPTIONS+= -fno-enforce-eh-specs +.ENDIF PICSWITCH:= CFLAGSOBJGUIST= ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - sw/inc sw/source unusedcode.easy
sw/inc/swurl.hxx | 12 ++ sw/source/core/access/acchyperlink.cxx |4 +-- sw/source/core/text/txtftn.cxx |3 -- sw/source/ui/app/docstyle.cxx|5 ++-- sw/source/ui/docvw/SidebarTxtControl.cxx |2 - sw/source/ui/docvw/edtwin.cxx|2 - sw/source/ui/docvw/romenu.cxx|2 - sw/source/ui/fldui/xfldui.cxx|2 - sw/source/ui/wrtsh/wrtsh2.cxx| 36 +-- unusedcode.easy | 28 ++-- 10 files changed, 36 insertions(+), 60 deletions(-) New commits: commit 16fc0fdb9008ffc48a6a363ffcd50555835a3857 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 6 22:38:16 2012 +0100 callcatcher: update unused code diff --git a/unusedcode.easy b/unusedcode.easy index 91368d3..cb5c9fe 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -775,7 +775,6 @@ dbtools::getConnection(rtl::OUString const, rtl::OUString const, rtl::OUString dbtools::throwFunctionNotSupportedException(rtl::OUString const, com::sun::star::uno::Referencecom::sun::star::uno::XInterface const, com::sun::star::uno::Any const) dp_misc::TRACE(rtl::OString const) dp_misc::writeConsoleError(rtl::OString const) -drawinglayer::attribute::SdrFillTextAttribute::isDefault() const drawinglayer::attribute::SdrFormTextAttribute::getFormTextShdwTransp() const drawinglayer::attribute::SdrTextAttribute::getPropertiesVersion() const drawinglayer::attribute::SdrTextAttribute::isWrongSpell() const @@ -799,25 +798,15 @@ oox::PropertyMap::dump(com::sun::star::uno::Referencecom::sun::star::beans::XPr oox::core::BinaryFilterBase::BinaryFilterBase(com::sun::star::uno::Referencecom::sun::star::uno::XComponentContext const) oox::core::FilterBase::openSubStorage(rtl::OUString const, bool) const oox::core::FilterBase::requestEncryptionData(comphelper::IDocPasswordVerifier) const -oox::dump::Output::writeAddress(oox::dump::Address const) +oox::dump::InputObjectBase::dumpNullCharArray(oox::dump::String const, unsigned short) +oox::dump::InputObjectBase::dumpNullUnicodeArray(oox::dump::String const) +oox::dump::Output::writeColRange(int, int) +oox::dump::Output::writeColRowRange(int, int) oox::dump::Output::writeColorABGR(int) -oox::dump::Output::writeRange(oox::dump::Range const) -oox::dump::Output::writeRangeList(std::__debug::vectoroox::dump::Range, std::allocatoroox::dump::Range const) -oox::dump::OutputObjectBase::writeAddressItem(oox::dump::String const, oox::dump::Address const) -oox::dump::OutputObjectBase::writeColIndexItem(oox::dump::String const, int) -oox::dump::OutputObjectBase::writeColRangeItem(oox::dump::String const, int, int) -oox::dump::OutputObjectBase::writeRangeItem(oox::dump::String const, oox::dump::Range const) -oox::dump::OutputObjectBase::writeRangeListItem(oox::dump::String const, std::__debug::vectoroox::dump::Range, std::allocatoroox::dump::Range const) -oox::dump::OutputObjectBase::writeRowIndexItem(oox::dump::String const, int) -oox::dump::OutputObjectBase::writeRowRangeItem(oox::dump::String const, int, int) -oox::dump::OutputObjectBase::writeTokenAddress3dItem(oox::dump::String const, rtl::OUString const, oox::dump::TokenAddress const, bool) -oox::dump::OutputObjectBase::writeTokenAddressItem(oox::dump::String const, oox::dump::TokenAddress const, bool) -oox::dump::OutputObjectBase::writeTokenRange3dItem(oox::dump::String const, rtl::OUString const, oox::dump::TokenRange const, bool) -oox::dump::OutputObjectBase::writeTokenRangeItem(oox::dump::String const, oox::dump::TokenRange const, bool) +oox::dump::Output::writeRowRange(int, int) oox::dump::SequenceRecordObjectBase::construct(oox::dump::OutputObjectBase const, oox::dump::BinaryInputStreamRef const, oox::dump::String const, oox::dump::String const) -oox::dump::StdHlinkObject::StdHlinkObject(oox::dump::InputObjectBase const) -oox::dump::StringHelper::appendToken(rtl::OUStringBuffer, long, unsigned short) -oox::dump::TextStreamObjectBase::construct(oox::dump::InputObjectBase const, unsigned short) +oox::dump::StringHelper::appendRange(rtl::OUStringBuffer, oox::dump::TokenRange const, bool) +oox::dump::StringHelper::appendRangeList(rtl::OUStringBuffer, std::__debug::vectoroox::dump::Range, std::allocatoroox::dump::Range const) oox::ole::OleHelper::importStdHlink(oox::ole::StdHlinkInfo, oox::BinaryInputStream, bool) oox::xls::BiffAutoFilterContext::BiffAutoFilterContext(oox::xls::WorksheetHelper const, oox::xls::AutoFilter) oox::xls::BiffCodecHelper::implReadFilePass(oox::xls::BiffInputStream, oox::xls::BiffType) @@ -889,9 +878,6 @@ sd::LeftImpressPaneShell::RegisterInterface(SfxModule*) sd::ToolPanelPaneShell::RegisterInterface(SfxModule*) sd::View::LockRedraw(unsigned char) sd::ViewShellBase::RegisterFactory(unsigned short) -sd::framework::ConfigurationClassifier::GetC1andC2() const
[Libreoffice-commits] .: binfilter/bf_sc binfilter/inc
binfilter/bf_sc/source/core/data/sc_global.cxx | 27 ---
binfilter/bf_sc/source/ui/dbgui/asciiopt.hrc| 55 --
binfilter/bf_sc/source/ui/dbgui/makefile.mk |2
binfilter/bf_sc/source/ui/dbgui/sc_asciiopt.cxx | 214
binfilter/bf_sc/source/ui/dbgui/sc_asciiopt.src | 66 ---
binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx |2
binfilter/bf_sc/source/ui/inc/asciiopt.hxx | 105 ---
binfilter/bf_sc/source/ui/inc/csvgrid.hxx |1
binfilter/bf_sc/source/ui/inc/csvtablebox.hxx | 48 -
binfilter/bf_sc/source/ui/inc/imoptdlg.hxx |4
binfilter/inc/bf_sc/global.hxx |1
11 files changed, 1 insertion(+), 524 deletions(-)
New commits:
commit d8a4706e91bf5ca518af96434394e24d10a5e0e6
Author: Caolán McNamara caol...@redhat.com
Date: Fri Apr 6 22:37:45 2012 +0100
callcatcher: recently unused code
diff --git a/binfilter/bf_sc/source/core/data/sc_global.cxx
b/binfilter/bf_sc/source/core/data/sc_global.cxx
index 96da4ca..c952081 100644
--- a/binfilter/bf_sc/source/core/data/sc_global.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_global.cxx
@@ -545,33 +545,6 @@ void global_InitAppOptions();
//
// static
-/*N*/ CharSet ScGlobal::GetCharsetValue( const String rCharSet )
-/*N*/ {
-/*N*/ // new TextEncoding values
-/*N*/ if ( CharClass::isAsciiNumeric( rCharSet ) )
-/*N*/ {
-/*?*/ sal_Int32 nVal = rCharSet.ToInt32();
-/*?*/ if ( !nVal || nVal == RTL_TEXTENCODING_DONTKNOW )
-/*?*/ return osl_getThreadTextEncoding();
-/*?*/ return (CharSet) nVal;
-/*N*/ }
-/*N*/ // old CharSet values for compatibility
-/*N*/ else if (rCharSet.EqualsIgnoreCaseAscii(ANSI) ) return
RTL_TEXTENCODING_MS_1252;
-/*N*/ else if (rCharSet.EqualsIgnoreCaseAscii(MAC) ) return
RTL_TEXTENCODING_APPLE_ROMAN;
-/*N*/ else if (rCharSet.EqualsIgnoreCaseAscii(IBMPC)) return
RTL_TEXTENCODING_IBM_850;
-/*N*/ else if (rCharSet.EqualsIgnoreCaseAscii(IBMPC_437)) return
RTL_TEXTENCODING_IBM_437;
-/*N*/ else if (rCharSet.EqualsIgnoreCaseAscii(IBMPC_850)) return
RTL_TEXTENCODING_IBM_850;
-/*N*/ else if (rCharSet.EqualsIgnoreCaseAscii(IBMPC_860)) return
RTL_TEXTENCODING_IBM_860;
-/*N*/ else if (rCharSet.EqualsIgnoreCaseAscii(IBMPC_861)) return
RTL_TEXTENCODING_IBM_861;
-/*N*/ else if (rCharSet.EqualsIgnoreCaseAscii(IBMPC_863)) return
RTL_TEXTENCODING_IBM_863;
-/*N*/ else if (rCharSet.EqualsIgnoreCaseAscii(IBMPC_865)) return
RTL_TEXTENCODING_IBM_865;
-/*N*/ //else if (rCharSet.EqualsIgnoreCaseAscii(SYSTEM) ) return
osl_getThreadTextEncoding();
-/*N*/ else return osl_getThreadTextEncoding();
-/*N*/ }
-
-//
-
-// static
/*N*/ String ScGlobal::GetCharsetString( CharSet eVal )
/*N*/ {
/*N*/ const sal_Char* pChar;
diff --git a/binfilter/bf_sc/source/ui/dbgui/asciiopt.hrc
b/binfilter/bf_sc/source/ui/dbgui/asciiopt.hrc
deleted file mode 100644
index e734e1c..000
--- a/binfilter/bf_sc/source/ui/dbgui/asciiopt.hrc
+++ /dev/null
@@ -1,55 +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 bf_sc.hrc
-//#define RID_SCDLG_ASCII 256
-#define RB_SEPARATED 1
-#define RB_FIXED 2
-#define FT_CHARSET 3
-#define LB_CHARSET 4
-#define FL_SEPOPT 5
-#define FT_FIELDSEP 6
-#define CB_FIELDSEP 7
-#define FT_TEXTSEP 8
-#define CB_TEXTSEP 9
-#define FL_FIELDOPT 10
-#define FT_TYPE 12
-#define FT_PREVIEW 13
-#define LB_TYPE1 23
-#define FL_WIDTH 30
-#define BTN_OK 31
-#define BTN_CANCEL 32
-#define BTN_HELP 33
-#define CTR_TABLEBOX 41
-#define CKB_TAB 51
-#define CKB_SPACE 52
-#define CKB_SEMICOLON 53
-#define CKB_COMMA 54
-#define CKB_OTHER 55
-#define ED_OTHER 56
-#define FT_AT_ROW 59
-#define NF_AT_ROW 60
-#define CB_ASONCE
[Libreoffice-commits] .: Branch 'feature/cmclayout' - 3 commits - vcl/inc vcl/source
vcl/inc/vcl/window.hxx | 32 ++--
vcl/source/control/lstbox.cxx |4
vcl/source/control/tabctrl.cxx |4 ++--
vcl/source/window/tabdlg.cxx |2 +-
vcl/source/window/window.cxx |8 +---
5 files changed, 42 insertions(+), 8 deletions(-)
New commits:
commit f4da833118b23015d13afde3403886e6c109606f
Author: Caolán McNamara caol...@redhat.com
Date: Fri Apr 6 21:28:37 2012 +0100
document methods
diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx
index 625e9f5..01e37ee 100644
--- a/vcl/inc/vcl/window.hxx
+++ b/vcl/inc/vcl/window.hxx
@@ -586,6 +586,15 @@ protected:
voidCallEventListeners( sal_uLong nEvent, void* pData =
NULL );
voidFireVclEvent( VclSimpleEvent* pEvent );
+/*
+ * Widgets call this to inform their owner container that the widget wants
+ * to renegotiate its size. Should be called when a widget has a new size
+ * request. e.g. a FixedText Control gets a new label.
+ *
+ * akin to gtk_widget_queue_resize
+ */
+SAL_DLLPRIVATE void queue_resize();
+
// FIXME: this is a hack to workaround missing layout functionality
SAL_DLLPRIVATE void ImplAdjustNWFSizes();
public:
@@ -1060,10 +1069,29 @@ public:
virtual ::com::sun::star::uno::Reference
::com::sun::star::datatransfer::clipboard::XClipboard GetClipboard();
virtual ::com::sun::star::uno::Reference
::com::sun::star::datatransfer::clipboard::XClipboard GetPrimarySelection();
-// Advisory Sizing - what is a good size for this widget ?
+/*
+ * Advisory Sizing - what is a good size for this widget
+ *
+ * Retrieves the preferred size of a widget ignoring
+ * width-request and height-request properties.
+ *
+ * Implement this in sub-classes to tell layout
+ * the preferred widget size.
+ */
virtual Size GetOptimalSize(WindowSizeType eType) const;
+
+/*
+ * Retrieves the preferred size of a widget taking
+ * into account the width-request and height-request properties.
+ *
+ * Overrides the result of GetOptimalSize to honor the
+ * width-request and height-request properties.
+ *
+ * @see GetOptimalSize
+ *
+ * akin to gtk_widget_get_preferred_size
+ */
Size get_preferred_size() const;
-void queueResize();
virtual void setChildAnyProperty(const rtl::OString rString, const
::com::sun::star::uno::Any rValue);
virtual ::com::sun::star::uno::Any getWidgetAnyProperty(const rtl::OString
rString) const;
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 6196d77..e594207 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -1957,14 +1957,14 @@ void TabControl::SetTabPage( sal_uInt16 nPageId,
TabPage* pTabPage )
// Erst hier setzen, damit Resize nicht TabPage umpositioniert
pItem-mpTabPage = pTabPage;
-queueResize();
+queue_resize();
if ( pItem-mnId == mnCurPageId )
ImplChangeTabPage( pItem-mnId, 0 );
}
else
{
pItem-mpTabPage = NULL;
-queueResize();
+queue_resize();
}
}
}
diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx
index 517ce33..0701533 100644
--- a/vcl/source/window/tabdlg.cxx
+++ b/vcl/source/window/tabdlg.cxx
@@ -260,7 +260,7 @@ void TabDialog::StateChanged( StateChangedType nType )
void TabDialog::AdjustLayout()
{
ImplPosControls();
-queueResize();
+queue_resize();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index e24c713..d16b831 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -4927,7 +4927,7 @@ void Window::UserEvent( sal_uLong, void* )
void Window::StateChanged( StateChangedType )
{
-queueResize();
+queue_resize();
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
}
@@ -9632,7 +9632,7 @@ Selection Window::GetSurroundingTextSelection() const
//Poor man's equivalent, when widget wants to renegotiate
//size, get parent dialog and call resize on it
-void Window::queueResize()
+void Window::queue_resize()
{
Dialog *pParent = GetParentDialog();
if (!pParent)
commit 18130178e408b79968773f90316dead1f0f26f72
Author: Caolán McNamara caol...@redhat.com
Date: Fri Apr 6 09:01:50 2012 +0100
don't bother with children resize request while dialog is closing
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index dfb839f..e24c713 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -9630,13 +9630,15 @@ Selection Window::GetSurroundingTextSelection() const
return Selection( 0, 0 );
}
-//Poor man's equivalent, when widget want's to renegotiate
+//Poor man's equivalent, when widget wants to renegotiate
//size, get
[Libreoffice-commits] .: sc/source unusedcode.easy
sc/source/filter/inc/pagesettings.hxx | 25
sc/source/filter/oox/pagesettings.cxx | 100 --
unusedcode.easy | 12
3 files changed, 137 deletions(-)
New commits:
commit c1036d7ab06e6b85763e90659c08e1f450ff50ab
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Apr 7 01:20:48 2012 +0200
Remove unused code oox::xls::PageSettings
diff --git a/sc/source/filter/inc/pagesettings.hxx
b/sc/source/filter/inc/pagesettings.hxx
index 0ce662c..5ff75bc 100644
--- a/sc/source/filter/inc/pagesettings.hxx
+++ b/sc/source/filter/inc/pagesettings.hxx
@@ -125,31 +125,6 @@ public:
/** Imports the PICTURE record from the passed stream. */
voidimportPicture( const ::oox::core::Relations
rRelations, SequenceInputStream rStrm );
-/** Imports the LEFTMARGIN record from the passed BIFF stream. */
-voidimportLeftMargin( BiffInputStream rStrm );
-/** Imports the RIGHTMARGIN record from the passed BIFF stream. */
-voidimportRightMargin( BiffInputStream rStrm );
-/** Imports the TOPMARGIN record from the passed BIFF stream. */
-voidimportTopMargin( BiffInputStream rStrm );
-/** Imports the BOTTOMMARGIN record from the passed BIFF stream. */
-voidimportBottomMargin( BiffInputStream rStrm );
-/** Imports the SETUP record from the passed BIFF stream. */
-voidimportPageSetup( BiffInputStream rStrm );
-/** Imports the HCENTER record from the passed BIFF stream. */
-voidimportHorCenter( BiffInputStream rStrm );
-/** Imports the VCENTER record from the passed BIFF stream. */
-voidimportVerCenter( BiffInputStream rStrm );
-/** Imports the PRINTHEADERS record from the passed BIFF stream. */
-voidimportPrintHeaders( BiffInputStream rStrm );
-/** Imports the PRINTGRIDLINES record from the passed BIFF stream. */
-voidimportPrintGridLines( BiffInputStream rStrm );
-/** Imports the HEADER record from the passed BIFF stream. */
-voidimportHeader( BiffInputStream rStrm );
-/** Imports the FOOTER record from the passed BIFF stream. */
-voidimportFooter( BiffInputStream rStrm );
-/** Imports the PICTURE record from the passed BIFF stream. */
-voidimportPicture( BiffInputStream rStrm );
-
/** Sets whether percentual scaling or fit to width/height scaling is
used. */
voidsetFitToPagesMode( bool bFitToPages );
diff --git a/sc/source/filter/oox/pagesettings.cxx
b/sc/source/filter/oox/pagesettings.cxx
index 6f140b1..8fcbd72 100644
--- a/sc/source/filter/oox/pagesettings.cxx
+++ b/sc/source/filter/oox/pagesettings.cxx
@@ -328,106 +328,6 @@ void PageSettings::importPicture( const Relations
rRelations, SequenceInputStre
importPictureData( rRelations, BiffHelper::readString( rStrm ) );
}
-void PageSettings::importLeftMargin( BiffInputStream rStrm )
-{
-rStrm maModel.mfLeftMargin;
-}
-
-void PageSettings::importRightMargin( BiffInputStream rStrm )
-{
-rStrm maModel.mfRightMargin;
-}
-
-void PageSettings::importTopMargin( BiffInputStream rStrm )
-{
-rStrm maModel.mfTopMargin;
-}
-
-void PageSettings::importBottomMargin( BiffInputStream rStrm )
-{
-rStrm maModel.mfBottomMargin;
-}
-
-void PageSettings::importPageSetup( BiffInputStream rStrm )
-{
-sal_uInt16 nPaperSize, nScale, nFirstPage, nFitToWidth, nFitToHeight,
nFlags;
-rStrm nPaperSize nScale nFirstPage nFitToWidth nFitToHeight
nFlags;
-
-maModel.mnPaperSize = nPaperSize; // equal in BIFF and OOX
-maModel.mnScale = nScale;
-maModel.mnFirstPage = nFirstPage;
-maModel.mnFitToWidth = nFitToWidth;
-maModel.mnFitToHeight= nFitToHeight;
-maModel.mnOrientation= getFlagValue( nFlags, BIFF_PAGESETUP_PORTRAIT,
XML_portrait, XML_landscape );
-maModel.mnPageOrder = getFlagValue( nFlags, BIFF_PAGESETUP_INROWS,
XML_overThenDown, XML_downThenOver );
-maModel.mbValidSettings = !getFlag( nFlags, BIFF_PAGESETUP_INVALID );
-maModel.mbUseFirstPage = true;
-maModel.mbBlackWhite = getFlag( nFlags, BIFF_PAGESETUP_BLACKWHITE );
-
-if( getBiff() = BIFF5 )
-{
-sal_uInt16 nHorPrintRes, nVerPrintRes, nCopies;
-rStrm nHorPrintRes nVerPrintRes maModel.mfHeaderMargin
maModel.mfFooterMargin nCopies;
-
-maModel.mnCopies = nCopies;
-maModel.mnOrientation = getFlagValue( nFlags,
BIFF_PAGESETUP_DEFAULTORIENT, XML_default, maModel.mnOrientation );
-maModel.mnHorPrintRes = nHorPrintRes;
-maModel.mnVerPrintRes = nVerPrintRes;
-maModel.mnCellComments = getFlagValue( nFlags,
BIFF_PAGESETUP_PRINTNOTES, XML_asDisplayed, XML_none );
-maModel.mbUseFirstPage = getFlag( nFlags, BIFF_PAGESETUP_USEFIRSTPAGE
);
-
