[Libreoffice-commits] Changes to 'feature/gbuild_scp2'
New branch 'feature/gbuild_scp2' available with the following commits: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'feature/gbuild_shell'
New branch 'feature/gbuild_shell' available with the following commits: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source slideshow/source xmlsecurity/source
editeng/source/editeng/impedit3.cxx |2 +-
slideshow/source/engine/slideshowimpl.cxx |2 +-
xmlsecurity/source/helper/documentsignaturehelper.cxx |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit a16060116346533923c607bd406d3fea511b41ec
Author: Julien Nabet
Date: Sun Apr 8 01:01:31 2012 +0200
Fix Prefer prefix ++/-- operators
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index a380c08..46cfe04 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -2349,7 +2349,7 @@ void ImpEditEngine::CreateTextPortions( ParaPortion*
pParaPortion, sal_uInt16& r
DBG_ASSERT( (nInvPos != aPositions.end()), "InvPos ?!" );
::std::set< sal_uInt32 >::iterator i = nInvPos;
-i++;
+++i;
while ( i != aPositions.end() )
{
TextPortion* pNew = new TextPortion( static_cast(*i++) -
static_cast(*nInvPos++) );
diff --git a/slideshow/source/engine/slideshowimpl.cxx
b/slideshow/source/engine/slideshowimpl.cxx
index ca91a6c..7718019 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -902,7 +902,7 @@ PolygonMap::iterator SlideShowImpl::findPolygons(
uno::Referencefirst == xDrawPage)
bFound = true;
else
-aIter++;
+++aIter;
}
return aIter;
diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx
b/xmlsecurity/source/helper/documentsignaturehelper.cxx
index 7523bf1..8b10f03 100644
--- a/xmlsecurity/source/helper/documentsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx
@@ -374,7 +374,7 @@ bool DocumentSignatureHelper::checkIfAllFilesAreSigned(
//find the file in the element list
typedef ::std::vector< ::rtl::OUString >::const_iterator CIT;
-for (CIT aIter = sElementList.begin(); aIter < sElementList.end();
aIter++)
+for (CIT aIter = sElementList.begin(); aIter !=
sElementList.end(); ++aIter)
{
::rtl::OUString sElementListURI = *aIter;
if (alg == OOo2Document)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source unusedcode.easy
sc/source/filter/inc/worksheetsettings.hxx | 19 --
sc/source/filter/oox/worksheetsettings.cxx | 82 -
unusedcode.easy|9 ---
3 files changed, 110 deletions(-)
New commits:
commit b63afcd27df0eb7123782b7d80bc0963df9fedb9
Author: Julien Nabet
Date: Sat Apr 7 23:14:32 2012 +0200
Clean oox::xls::WorksheetSettings
diff --git a/sc/source/filter/inc/worksheetsettings.hxx
b/sc/source/filter/inc/worksheetsettings.hxx
index 175c61d..26e8019 100644
--- a/sc/source/filter/inc/worksheetsettings.hxx
+++ b/sc/source/filter/inc/worksheetsettings.hxx
@@ -109,25 +109,6 @@ public:
/** Imports phonetic settings from the PHONETICPR record. */
voidimportPhoneticPr( SequenceInputStream& rStrm );
-/** Imports sheet properties from a SHEETEXT record. */
-voidimportSheetExt( BiffInputStream& rStrm );
-/** Imports sheet properties from a SHEETPR record. */
-voidimportSheetPr( BiffInputStream& rStrm );
-/** Imports protection status from the PROTECT record. */
-voidimportProtect( BiffInputStream& rStrm );
-/** Imports object protection status from the OBJECTPROTECT record. */
-voidimportObjectProtect( BiffInputStream& rStrm );
-/** Imports scenario protection status from the SCENPROTECT record. */
-voidimportScenProtect( BiffInputStream& rStrm );
-/** Imports sheet password hash from the PASSWORD record. */
-voidimportPassword( BiffInputStream& rStrm );
-/** Imports protection settings from the SHEETPROTECTION record. */
-voidimportSheetProtection( BiffInputStream& rStrm );
-/** Imports the VBA code module name from the CODENAME record. */
-voidimportCodeName( BiffInputStream& rStrm );
-/** Imports phonetic settings from the PHONETICPR record. */
-voidimportPhoneticPr( BiffInputStream& rStrm );
-
/** Converts the imported worksheet settings. */
voidfinalizeImport();
diff --git a/sc/source/filter/oox/worksheetsettings.cxx
b/sc/source/filter/oox/worksheetsettings.cxx
index 768041b..3010aec 100644
--- a/sc/source/filter/oox/worksheetsettings.cxx
+++ b/sc/source/filter/oox/worksheetsettings.cxx
@@ -237,88 +237,6 @@ void WorksheetSettings::importPhoneticPr(
SequenceInputStream& rStrm )
maPhoneticSett.importPhoneticPr( rStrm );
}
-void WorksheetSettings::importSheetExt( BiffInputStream& rStrm )
-{
-rStrm.skip( 16 );
-sal_uInt32 nFlags;
-rStrm >> nFlags;
-sal_uInt8 nColorIdx = extractValue< sal_uInt8 >( nFlags, 0, 7 );
-if( nColorIdx != BIFF_SHEETEXT_NOTABCOLOR )
-maSheetSettings.maTabColor.setPaletteClr( nColorIdx );
-}
-
-void WorksheetSettings::importSheetPr( BiffInputStream& rStrm )
-{
-sal_uInt16 nFlags;
-rStrm >> nFlags;
-// worksheet vs. dialogsheet
-if( getFlag( nFlags, BIFF_SHEETPR_DIALOGSHEET ) )
-{
-OSL_ENSURE( getSheetType() == SHEETTYPE_WORKSHEET,
"WorksheetSettings::importSheetPr - unexpected sheet type" );
-setSheetType( SHEETTYPE_DIALOGSHEET );
-}
-// outline settings
-maSheetSettings.mbApplyStyles = getFlag( nFlags, BIFF_SHEETPR_APPLYSTYLES
);
-maSheetSettings.mbSummaryRight = getFlag( nFlags,
BIFF_SHEETPR_SYMBOLSRIGHT );
-maSheetSettings.mbSummaryBelow = getFlag( nFlags,
BIFF_SHEETPR_SYMBOLSBELOW );
-// fit printout to width/height
-getPageSettings().setFitToPagesMode( getFlag( nFlags,
BIFF_SHEETPR_FITTOPAGES ) );
-// save external linked values, in BIFF5-BIFF8 moved to BOOKBOOK record
-if( getBiff() <= BIFF4 )
-getWorkbookSettings().setSaveExtLinkValues( !getFlag( nFlags,
BIFF_SHEETPR_SKIPEXT ) );
-}
-
-void WorksheetSettings::importProtect( BiffInputStream& rStrm )
-{
-maSheetProt.mbSheet = rStrm.readuInt16() != 0;
-}
-
-void WorksheetSettings::importObjectProtect( BiffInputStream& rStrm )
-{
-maSheetProt.mbObjects = rStrm.readuInt16() != 0;
-}
-
-void WorksheetSettings::importScenProtect( BiffInputStream& rStrm )
-{
-maSheetProt.mbScenarios = rStrm.readuInt16() != 0;
-}
-
-void WorksheetSettings::importPassword( BiffInputStream& rStrm )
-{
-rStrm >> maSheetProt.mnPasswordHash;
-}
-
-void WorksheetSettings::importSheetProtection( BiffInputStream& rStrm )
-{
-sal_uInt32 nFlags = rStrm.readuInt32();
-// set flag means protection is disabled
-maSheetProt.mbObjects = !getFlag( nFlags, BIFF_SHEETPROT_OBJECTS
);
-maSheetProt.mbScenarios= !getFlag( nFlags,
BIFF_SHEETPROT_SCENARIOS );
-maSheetProt.mbFormatCells = !getFlag( nFlags,
BIFF_SHEETPROT_FORMAT_CELLS );
-maSheetProt.mbFormatColumns= !getFlag( nFlags,
BIFF_SHEETPROT_FORMAT_COLUMNS );
-maSheetProt.mbFormatRows = !getFlag( nFlags,
BIFF_SHEETPROT_FORMAT_ROWS );
-maSheetProt.mbInsertColumns= !getFlag( nFlags,
BIFF_SHEE
[Libreoffice-commits] .: oox/source
oox/source/vml/vmlformatting.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c893a820c447c9014d35597a37c3220c261e35ae
Author: Julien Nabet
Date: Sat Apr 7 21:12:27 2012 +0200
Fix Redundant assignment of "nModToken" in switch
diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx
index f7ebde4..4bc582d 100644
--- a/oox/source/vml/vmlformatting.cxx
+++ b/oox/source/vml/vmlformatting.cxx
@@ -248,7 +248,7 @@ bool lclExtractDouble( double& orfValue, sal_Int32&
ornEndPos, const OUString& r
sal_Int32 nModToken = XML_TOKEN_INVALID;
switch( AttributeConversion::decodeToken( aColorIndex.copy( 0,
nOpenParen ) ) )
{
-case XML_darken:nModToken = XML_shade;
+case XML_darken:nModToken = XML_shade;break;
case XML_lighten: nModToken = XML_tint;
}
sal_Int32 nValue = aColorIndex.copy( nOpenParen + 1, nCloseParen -
nOpenParen - 1 ).toInt32();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - l10ntools/inc sal/qa
l10ntools/inc/l10ntools/HelpIndexer.hxx | 31 +++
l10ntools/inc/l10ntools/HelpSearch.hxx | 31 +++
sal/qa/osl/file/osl_old_test_file.cxx | 24 +++-
3 files changed, 69 insertions(+), 17 deletions(-)
New commits:
commit e414736c8b3e55b4ddc2bf308435ef6f726fb517
Author: Caolán McNamara
Date: Sat Apr 7 16:42:30 2012 +0100
add headers to Gert's files
diff --git a/l10ntools/inc/l10ntools/HelpIndexer.hxx
b/l10ntools/inc/l10ntools/HelpIndexer.hxx
index 02281c2..28c7eb6 100644
--- a/l10ntools/inc/l10ntools/HelpIndexer.hxx
+++ b/l10ntools/inc/l10ntools/HelpIndexer.hxx
@@ -1,3 +1,32 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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) 2012 Gert van Valkenhoef
+ * (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.
+ */
+
#ifndef HELPINDEXER_HXX
#define HELPINDEXER_HXX
@@ -67,3 +96,5 @@ class L10N_DLLPUBLIC HelpIndexer {
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/l10ntools/inc/l10ntools/HelpSearch.hxx
b/l10ntools/inc/l10ntools/HelpSearch.hxx
index 8c11aba..63e2807 100644
--- a/l10ntools/inc/l10ntools/HelpSearch.hxx
+++ b/l10ntools/inc/l10ntools/HelpSearch.hxx
@@ -1,3 +1,32 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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) 2012 Gert van Valkenhoef
+ * (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.
+ */
+
#ifndef HELPSEARCH_HXX
#define HELPSEARCH_HXX
@@ -34,3 +63,5 @@ class L10N_DLLPUBLIC HelpSearch {
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 63de3197af6ce874e441936638c4a9a73af4b1a3
Author: Caolán McNamara
Date: Sat Apr 7 16:14:51 2012 +0100
WaE: msvc, unreachable code
diff --git a/sal/qa/osl/file/osl_old_test_file.cxx
b/sal/qa/osl/file/osl_old_test_file.cxx
index 3d12b76..d8ab73a 100644
--- a/sal/qa/osl/file/osl_old_test_file.cxx
+++ b/sal/qa/osl/file/osl_old_test_file.cxx
@@ -115,12 +115,10 @@ const char * const aSource3[ ] =
using ::rtl::OUString;
using ::rtl::OUStringToOString;
using ::rtl::OString;
+
void oldtestfile::test_file_001()
{
-#ifdef WIN32
-return;
-#endif
-
+#ifndef WIN32
OUString base1( RTL_CONSTASCII_USTRINGPARAM( "file:///" TEST_VOLUME "bla"
) );
int i;
for( i = 0 ; aSource1[i] ; i +=2 )
@@ -142,15 +140,12 @@ void oldtestfile::test_file_001()
OUString err1( RTL_CONSTASCII_USTRINGPARAM( "../.." ) );
OUString target;
// CPPUNIT_ASSERT_MESSAGE("failure #11", osl_File_E_None !=
osl_getAbsoluteFileURL( base1.pData , err1.pData , &target.pData ) );
-
+#endif
}
void oldtestfile::test_file_002()
{
-#ifdef WIN32
-return;
-#endif
-
+#ifndef WIN32
OUString base2( RTL_CONSTASCII_USTRINGPARAM( "file:///" TEST_VOLUME
"bla/blubs/schnubbel" ) );
int i;
for( i = 0 ; aSource2[i] ; i +=2 )
@@ -166,16 +161,13 @@ void oldtestfile::test_file_002()
}
OString o = OUStringToOString
[Libreoffice-commits] .: sd/source
sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 34 ++
sd/source/ui/view/drviewsa.cxx| 20
sd/source/ui/view/frmview.cxx |6 +-
sd/source/ui/view/viewshel.cxx|2
4 files changed, 29 insertions(+), 33 deletions(-)
New commits:
commit 85bdc19fcb6a1a71d6aef0f00b8610f4b85e5a00
Author: Olivier Hallot
Date: Sat Apr 7 13:41:56 2012 -0300
More stuffs related to OUStrings in sd
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index 9231f42..b025ced 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -68,8 +68,6 @@ using namespace ::com::sun::star::accessibility;
class SfxViewFrame;
-#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString)))
-
namespace accessibility {
@@ -399,31 +397,30 @@ void SAL_CALL
OUString sFirstService = aServices[0];
if ( sFirstService == "com.sun.star.drawing.DrawingDocumentDrawView" )
{
-if( aServices.getLength() >= 2 &&
-
aServices[1].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.PresentationView")))
+if( aServices.getLength() >= 2 && aServices[1] ==
"com.sun.star.presentation.PresentationView")
{
SolarMutexGuard aGuard;
-sName = String( SdResId(SID_SD_A11Y_I_DRAWVIEW_N) );
+sName = ResId::toString(SdResId(SID_SD_A11Y_I_DRAWVIEW_N) );
}
else
{
SolarMutexGuard aGuard;
-sName = String( SdResId(SID_SD_A11Y_D_DRAWVIEW_N) );
+sName = ResId::toString( SdResId(SID_SD_A11Y_D_DRAWVIEW_N) );
}
}
else if ( sFirstService == "com.sun.star.presentation.NotesView" )
{
SolarMutexGuard aGuard;
-sName = String( SdResId(SID_SD_A11Y_I_NOTESVIEW_N) );
+sName = ResId::toString( SdResId(SID_SD_A11Y_I_NOTESVIEW_N) );
}
else if ( sFirstService == "com.sun.star.presentation.HandoutView" )
{
SolarMutexGuard aGuard;
-sName = String( SdResId(SID_SD_A11Y_I_HANDOUTVIEW_N) );
+sName = ResId::toString( SdResId(SID_SD_A11Y_I_HANDOUTVIEW_N) );
}
else
{
@@ -432,7 +429,7 @@ void SAL_CALL
}
else
{
-sName =
OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleDrawDocumentView"));
+sName = "AccessibleDrawDocumentView";
}
return sName;
}
@@ -456,31 +453,30 @@ void SAL_CALL
OUString sFirstService = aServices[0];
if ( sFirstService == "com.sun.star.drawing.DrawingDocumentDrawView" )
{
-if( aServices.getLength() >= 2 &&
-
aServices[1].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.PresentationView")))
+if( aServices.getLength() >= 2 && aServices[1] ==
"com.sun.star.presentation.PresentationView")
{
SolarMutexGuard aGuard;
-sDescription = String( SdResId(SID_SD_A11Y_I_DRAWVIEW_D) );
+sDescription = ResId::toString(
SdResId(SID_SD_A11Y_I_DRAWVIEW_D) );
}
else
{
SolarMutexGuard aGuard;
-sDescription = String( SdResId(SID_SD_A11Y_D_DRAWVIEW_D) );
+sDescription = ResId::toString(
SdResId(SID_SD_A11Y_D_DRAWVIEW_D) );
}
}
else if ( sFirstService == "com.sun.star.presentation.NotesView" )
{
SolarMutexGuard aGuard;
-sDescription = String( SdResId(SID_SD_A11Y_I_NOTESVIEW_D) );
+sDescription = ResId::toString( SdResId(SID_SD_A11Y_I_NOTESVIEW_D)
);
}
else if ( sFirstService == "com.sun.star.presentation.HandoutView" )
{
SolarMutexGuard aGuard;
-sDescription = String( SdResId(SID_SD_A11Y_I_HANDOUTVIEW_D) );
+sDescription = ResId::toString(
SdResId(SID_SD_A11Y_I_HANDOUTVIEW_D) );
}
else
{
@@ -489,7 +485,7 @@ void SAL_CALL
}
else
{
-sDescription = OUString(RTL_CONSTASCII_USTRINGPARAM("Accessible Draw
Document"));
+sDescription = "Accessible Draw Document";
}
return sDescription;
}
@@ -694,7 +690,7 @@ void SAL_CALL AccessibleDrawDocumentView::disposing (void)
void AccessibleDrawDocumentView::UpdateAccessibleName (void)
{
OUString sNewName (CreateAccessibleName());
-sNewName += A2S(": ");
+sNewName += ": ";
// Add the number of the current slide.
uno::Reference xView (mxController, uno::UNO_QUERY);
@@ -705,7 +701,7 @@ void AccessibleDrawDocumentView::UpdateAccessibleName (void)
tr
[Libreoffice-commits] .: sc/CppunitTest_sc_ucalc.mk sc/inc sc/source sd/CppunitTest_sd_uimpress.mk sd/inc sw/CppunitTest_sw_swdoc_test.mk sw/inc
sc/CppunitTest_sc_ucalc.mk |3 +--
sc/inc/clipparam.hxx|3 ++-
sc/inc/document.hxx | 36 ++--
sc/inc/dpobject.hxx | 20 ++--
sc/inc/dpsave.hxx | 10 +-
sc/inc/dpshttab.hxx |4 ++--
sc/inc/externalrefmgr.hxx |4 ++--
sc/inc/global.hxx |2 +-
sc/inc/pivot.hxx|4 ++--
sc/inc/rangenam.hxx |4 ++--
sc/inc/reffind.hxx |2 +-
sc/inc/scdll.hxx|3 ++-
sc/inc/stringutil.hxx |2 +-
sc/source/ui/inc/refundo.hxx|3 ++-
sc/source/ui/inc/undoblk.hxx|2 +-
sc/source/ui/inc/undotab.hxx|4 ++--
sd/CppunitTest_sd_uimpress.mk |3 +--
sd/inc/drawdoc.hxx |2 +-
sd/inc/sddll.hxx|3 ++-
sw/CppunitTest_sw_swdoc_test.mk |3 +--
sw/inc/docufld.hxx |2 +-
sw/inc/swdll.hxx|3 ++-
sw/inc/swscanner.hxx|3 ++-
23 files changed, 64 insertions(+), 61 deletions(-)
New commits:
commit 69d46dd7a6adfffd71da055bb65108c80d27395f
Author: LuboÅ¡ LuÅák
Date: Sat Apr 7 18:37:50 2012 +0200
do not include contents of huge sc/sd/sw libs into tiny unittests
This decreases debug build dir size by about 0.5G for gcc and 1G for clang.
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index b154d1d..d4de63f 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -35,8 +35,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_ucalc, \
sc/qa/unit/ucalc \
))
-$(eval $(call gb_CppunitTest_add_library_objects,sc_ucalc,sc))
-
$(call gb_CxxObject_get_target,sc/qa/unit/ucalc): \
$(WORKDIR)/AllLangRes/for \
$(WORKDIR)/AllLangRes/forui \
@@ -60,6 +58,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sc_ucalc, \
salhelper \
sax \
sb \
+sc \
sfx \
sot \
svl \
diff --git a/sc/inc/clipparam.hxx b/sc/inc/clipparam.hxx
index 63b4c9a..c7ecd2a 100644
--- a/sc/inc/clipparam.hxx
+++ b/sc/inc/clipparam.hxx
@@ -32,6 +32,7 @@
#include "rangelst.hxx"
#include "rangenam.hxx"
#include "charthelper.hxx"
+#include "scdllapi.h"
#include
@@ -50,7 +51,7 @@ struct ScClipParam
ScRangeListVector maProtectedChartRangesVector;
ScClipParam();
-ScClipParam(const ScRange& rRange, bool bCutMode);
+SC_DLLPUBLIC ScClipParam(const ScRange& rRange, bool bCutMode);
explicit ScClipParam(const ScClipParam& r);
bool isMultiRange() const;
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 1c0477c..99bbc54 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -483,8 +483,8 @@ public:
SC_DLLPUBLIC void GetRangeNameMap(std::map&
rRangeName);
SC_DLLPUBLIC ScRangeName* GetRangeName(SCTAB nTab) const;
SC_DLLPUBLIC ScRangeName* GetRangeName() const;
-void SetRangeName(SCTAB nTab, ScRangeName* pNew);
-void SetRangeName( ScRangeName* pNewRangeName );
+SC_DLLPUBLIC void SetRangeName(SCTAB nTab, ScRangeName* pNew);
+SC_DLLPUBLIC void SetRangeName( ScRangeName* pNewRangeName );
SCTAB GetMaxTableNumber() { return
static_cast(maTabs.size()) - 1; }
voidSetMaxTableNumber(SCTAB nNumber) { nMaxTableNumber =
nNumber; }
@@ -599,8 +599,8 @@ public:
SC_DLLPUBLIC bool RenameTab( SCTAB nTab, const rtl::OUString&
rName,
bool bUpdateRef = true,
bool bExternalDocument = false );
-boolMoveTab( SCTAB nOldPos, SCTAB nNewPos,
ScProgress* pProgress = NULL );
-boolCopyTab( SCTAB nOldPos, SCTAB nNewPos,
+SC_DLLPUBLIC bool MoveTab( SCTAB nOldPos, SCTAB nNewPos,
ScProgress* pProgress = NULL );
+SC_DLLPUBLIC bool CopyTab( SCTAB nOldPos, SCTAB nNewPos,
const ScMarkData* pOnlyMarked = NULL );
SC_DLLPUBLIC sal_uLong TransferTab(ScDocument* pSrcDoc, SCTAB
nSrcPos, SCTAB nDestPos,
bool bInsertNew = true,
@@ -608,8 +608,8 @@ public:
SC_DLLPUBLIC void TransferDrawPage(ScDocument* pSrcDoc, SCTAB
nSrcPos, SCTAB nDestPos);
SC_DLLPUBLIC void SetVisible( SCTAB nTab, bool bVisible );
SC_DLLPUBLIC bool IsVisible( SCTAB nTab ) const;
-boolIsStreamValid( SCTAB nTab ) const;
-voidSetStreamValid( SCTAB nTab, bool bSet, bool bIgnoreLock =
false );
+SC_DLLPUBLIC boolIsStreamValid( SCTAB nTab ) const;
+SC_DLLPUBLIC voidSetStreamValid( SCTAB nTab, bool bSet, bool
bIgnoreLock = false );
voidLockStreamValid( bool bLock );
boolIsStreamValidLocked() const {
return mbStreamValidLocked; }
boolIsPendingRowHeights( SCTAB n
[Libreoffice-commits] .: xmlhelp/Package_xml.mk
xmlhelp/Package_xml.mk | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit 5b5301618fde17693f5299c2a55ae91fe8a12b11 Author: David Tardon Date: Sat Apr 7 18:27:13 2012 +0200 bah, really deliver the files diff --git a/xmlhelp/Package_xml.mk b/xmlhelp/Package_xml.mk index 066838b..7531e2f 100644 --- a/xmlhelp/Package_xml.mk +++ b/xmlhelp/Package_xml.mk @@ -27,11 +27,11 @@ $(eval $(call gb_Package_Package,xmlhelp_xml,$(SRCDIR)/xmlhelp/util)) -$(eval $(call gb_Package_add_file,bin/embed.xsl,embed.xsl)) -$(eval $(call gb_Package_add_file,bin/idxcaption.xsl,idxcaption.xsl)) -$(eval $(call gb_Package_add_file,bin/idxcontent.xsl,idxcontent.xsl)) -$(eval $(call gb_Package_add_file,bin/main_transform.xsl,main_transform.xsl)) +$(eval $(call gb_Package_add_file,xmlhelp_xml,bin/embed.xsl,embed.xsl)) +$(eval $(call gb_Package_add_file,xmlhelp_xml,bin/idxcaption.xsl,idxcaption.xsl)) +$(eval $(call gb_Package_add_file,xmlhelp_xml,bin/idxcontent.xsl,idxcontent.xsl)) +$(eval $(call gb_Package_add_file,xmlhelp_xml,bin/main_transform.xsl,main_transform.xsl)) -$(eval $(call gb_Package_add_file,xml/ucpchelp.xml,ucpchelp.xml)) +$(eval $(call gb_Package_add_file,xmlhelp_xml,xml/ucpchelp.xml,ucpchelp.xml)) # 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] .: 2 commits - xmlhelp/Package_xml.mk xmlhelp/util
xmlhelp/Package_xml.mk |5 + 1 file changed, 5 insertions(+) New commits: commit 063c4244e4254ba85c2146b9c49e5d76b503de62 Author: David Tardon Date: Sat Apr 7 18:23:37 2012 +0200 drop executable flag diff --git a/xmlhelp/util/embed.xsl b/xmlhelp/util/embed.xsl old mode 100755 new mode 100644 diff --git a/xmlhelp/util/idxcaption.xsl b/xmlhelp/util/idxcaption.xsl old mode 100755 new mode 100644 diff --git a/xmlhelp/util/idxcontent.xsl b/xmlhelp/util/idxcontent.xsl old mode 100755 new mode 100644 diff --git a/xmlhelp/util/main_transform.xsl b/xmlhelp/util/main_transform.xsl old mode 100755 new mode 100644 diff --git a/xmlhelp/util/ucpchelp.xml b/xmlhelp/util/ucpchelp.xml old mode 100755 new mode 100644 commit 7de1c843d61729e33f7d4c7cc516a78b465b84b3 Author: David Tardon Date: Sat Apr 7 18:23:17 2012 +0200 install xsl files too diff --git a/xmlhelp/Package_xml.mk b/xmlhelp/Package_xml.mk index 5e23bb6..066838b 100644 --- a/xmlhelp/Package_xml.mk +++ b/xmlhelp/Package_xml.mk @@ -27,6 +27,11 @@ $(eval $(call gb_Package_Package,xmlhelp_xml,$(SRCDIR)/xmlhelp/util)) +$(eval $(call gb_Package_add_file,bin/embed.xsl,embed.xsl)) +$(eval $(call gb_Package_add_file,bin/idxcaption.xsl,idxcaption.xsl)) +$(eval $(call gb_Package_add_file,bin/idxcontent.xsl,idxcontent.xsl)) +$(eval $(call gb_Package_add_file,bin/main_transform.xsl,main_transform.xsl)) + $(eval $(call gb_Package_add_file,xml/ucpchelp.xml,ucpchelp.xml)) # 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] .: sw/CppunitTest_sw_filters_test.mk
sw/CppunitTest_sw_filters_test.mk |5 + 1 file changed, 1 insertion(+), 4 deletions(-) New commits: commit ac588638dcb2498ac42d7e1a958e598cc845d4c5 Author: David Tardon Date: Sat Apr 7 17:44:34 2012 +0200 path changed after gbuild conversion diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk index ed4b368..b9730cf 100644 --- a/sw/CppunitTest_sw_filters_test.mk +++ b/sw/CppunitTest_sw_filters_test.mk @@ -93,10 +93,7 @@ $(eval $(call gb_CppunitTest_add_components,sw_filters_test,\ ucb/source/core/ucb1 \ ucb/source/ucp/file/ucpfile1 \ unoxml/source/service/unoxml \ -)) - -$(eval $(call gb_CppunitTest_add_old_components,sw_filters_test,\ -ucpchelp1 \ +xmlhelp/util/ucpchelp1 \ )) $(eval $(call gb_CppunitTest_set_args,sw_filters_test,\ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 735c529277e2d667b6949a4753546f16a228ceac Author: David Tardon Date: Sat Apr 7 17:15:35 2012 +0200 move clucene back to OOO layer diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index fab2995..a11f312 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1147,7 +1147,7 @@ $(call gb_LinkTarget_add_linked_libs,$(1),\ endef -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE,\ +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ clucene \ )) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/linkoo | 17 -
1 file changed, 12 insertions(+), 5 deletions(-)
New commits:
commit 15953ab15b082638de8e8795abad5213be49bd08
Author: LuboÅ¡ LuÅák
Date: Sat Apr 7 17:07:06 2012 +0200
make linkoo not create backups by default
The 'linked' files are not used by anything, and they just waste space.
If somebody wants them for debugging or whatever reason, use --backup.
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 86ac247..8381ccc 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -62,6 +62,7 @@ if ($ENV{'OS'} eq 'MACOSX') {
}
my $dry_run = 0;
+my $backup = 0;
my $usage = 0;
my $LANG;
my $TARGET;
@@ -77,6 +78,8 @@ for my $a (@ARGV) {
$dry_run = 1;
} elsif (($a eq '--help') || ($a eq '-h')) {
$usage = 1;
+} elsif ($a eq '--backup') {
+ $backup = 1;
# ordered arguments
} elsif (!defined $OOO_INSTALL) {
@@ -94,7 +97,7 @@ if (!defined $OOO_BUILD && defined $ENV{SRC_ROOT}) {
}
if ($usage || !defined $OOO_INSTALL || !defined $OOO_BUILD) {
-printf "Usage: linkoo []
[--dry-run]\n";
+printf "Usage: linkoo []
[--dry-run] [--backup]\n";
exit (1);
}
@@ -212,12 +215,16 @@ sub do_link(@)
print "skipping symbolic link $dest/$dest_name -> $link\n";
}
} else {
- check_create_linked ($dest);
if (!$dry_run) {
# move / write the link
- rename ("$dest/$dest_name", "$dest/linked/$dest_name") ||
- defined $dont_check_link || die "Failed rename of
$dest/$dest_name: $!";
-
+ if ($backup) {
+ check_create_linked ($dest);
+ rename ("$dest/$dest_name", "$dest/linked/$dest_name") ||
+ defined $dont_check_link || die "Failed rename of
$dest/$dest_name: $!";
+ } else {
+ unlink ("$dest/$dest_name") ||
+ defined $dont_check_link || die "Failed remove of
$dest/$dest_name: $!";
+ }
symlink ("$src/$src_name", "$dest/$dest_name") || die "Failed to
symlink $src/$src_name: $!";
print " $dest_name";
} else {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - connectivity/source oox/inc oox/source sc/source toolkit/inc toolkit/source unusedcode.easy vcl/inc vcl/source
connectivity/source/drivers/mozab/MTable.cxx |6 -
connectivity/source/drivers/mozab/MTable.hxx |1
oox/inc/oox/dump/dumperbase.hxx |2
oox/inc/oox/ole/olehelper.hxx|8 -
oox/source/dump/dumperbase.cxx | 10 --
oox/source/ole/olehelper.cxx | 97 --
sc/source/filter/inc/biffhelper.hxx |3
sc/source/filter/oox/biffhelper.cxx | 98 ---
toolkit/inc/toolkit/controls/unocontrolmodel.hxx |1
toolkit/inc/toolkit/helper/macros.hxx|7 +
toolkit/source/controls/unocontrolmodel.cxx |8 -
unusedcode.easy |5 -
vcl/inc/vcl/pdfwriter.hxx|3
vcl/inc/vcl/slider.hxx |1
vcl/source/control/slider.cxx| 19
vcl/source/gdi/pdfwriter.cxx |5 -
vcl/source/gdi/pdfwriter_impl.cxx| 42 -
vcl/source/gdi/pdfwriter_impl.hxx|1
18 files changed, 6 insertions(+), 311 deletions(-)
New commits:
commit aefbfc7101bb9b4ef20968d45306ab97573f6597
Author: Caolán McNamara
Date: Sat Apr 7 15:53:56 2012 +0100
callcatcher: update and remove newly unused methods
diff --git a/connectivity/source/drivers/mozab/MTable.cxx
b/connectivity/source/drivers/mozab/MTable.cxx
index 755e4bd..47f7107 100644
--- a/connectivity/source/drivers/mozab/MTable.cxx
+++ b/connectivity/source/drivers/mozab/MTable.cxx
@@ -55,12 +55,6 @@ using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
-OTable::OTable( sdbcx::OCollection* _pTables, OConnection* _pConnection)
-:OTable_Base( _pTables, _pConnection, sal_True )
-,m_pConnection( _pConnection )
-{
-construct();
-}
// -
OTable::OTable( sdbcx::OCollection* _pTables, OConnection* _pConnection,
const ::rtl::OUString& _Name, const ::rtl::OUString& _Type,
const ::rtl::OUString& _Description )
diff --git a/connectivity/source/drivers/mozab/MTable.hxx
b/connectivity/source/drivers/mozab/MTable.hxx
index 3cc6728..a47725f 100644
--- a/connectivity/source/drivers/mozab/MTable.hxx
+++ b/connectivity/source/drivers/mozab/MTable.hxx
@@ -44,7 +44,6 @@ namespace connectivity
OConnection*m_pConnection;
public:
-OTable( sdbcx::OCollection* _pTables, OConnection* _pConnection);
OTable( sdbcx::OCollection* _pTables,
OConnection* _pConnection,
const ::rtl::OUString& _Name,
diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx
index 68df688..fb1ede5 100644
--- a/oox/inc/oox/dump/dumperbase.hxx
+++ b/oox/inc/oox/dump/dumperbase.hxx
@@ -1067,8 +1067,6 @@ public:
voidwriteArray( const sal_uInt8* pnData, sal_Size nSize,
sal_Unicode cSep = OOX_DUMP_LISTSEP );
voidwriteBool( bool bData );
voidwriteDateTime( const ::com::sun::star::util::DateTime&
rDateTime );
-voidwriteColIndex( sal_Int32 nCol );
-voidwriteRowIndex( sal_Int32 nRow );
template< typename Type >
inline void writeDec( Type nData, sal_Int32 nWidth = 0,
sal_Unicode cFill = ' ' )
diff --git a/oox/inc/oox/ole/olehelper.hxx b/oox/inc/oox/ole/olehelper.hxx
index 933d4a5..c7f3960 100644
--- a/oox/inc/oox/ole/olehelper.hxx
+++ b/oox/inc/oox/ole/olehelper.hxx
@@ -148,14 +148,6 @@ public:
BinaryInputStream& rInStrm,
bool bWithGuid );
-/** Imports an OLE StdHlink from the current position of the passed binary
-stream.
- */
-static bool importStdHlink(
-StdHlinkInfo& orHlinkInfo,
-BinaryInputStream& rInStrm,
-bool bWithGuid );
-
private:
OleHelper();// not implemented
~OleHelper(); // not implemented
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index 1f1cbc2..0d8039d 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -1828,16 +1828,6 @@ void Output::writeDateTime( const DateTime& rDateTime )
writeDec( rDateTime.Seconds, 2, '0' );
}
-void Output::writeColIndex( sal_Int32 nCol )
-{
-StringHelper::appendAddrCol( maLine, nCol, true );
-}
-
-void Output::writeRowIndex( sal_Int32 nRow )
-{
-StringHelper::appendAddrRow( maLine, nRow, true );
-}
-
//
bool Output::implIsValid() const
diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx
index dd9676e..dcd3982 100644
--- a/oox
[Libreoffice-commits] .: 3 commits - config_host.mk.in configure.in Makefile Module_tail_build.mk postprocess/packcomponents RepositoryExternal.mk Repository.mk tail_build/prj xmlhelp/Library_tvhlp1.m
Makefile|2 Module_tail_build.mk|1 Repository.mk |3 RepositoryExternal.mk | 33 + config_host.mk.in |3 configure.in| 12 +-- postprocess/packcomponents/makefile.mk |4 - tail_build/prj/build.lst|2 xmlhelp/Library_tvhlp1.mk | 54 +++ xmlhelp/Library_ucpchelp1.mk| 97 xmlhelp/Makefile|7 ++ xmlhelp/Module_xmlhelp.mk | 37 ++ xmlhelp/Package_xml.mk | 32 + xmlhelp/Zip_helpxsl.mk | 36 ++ xmlhelp/prj/build.lst |6 - xmlhelp/prj/d.lst | 10 -- xmlhelp/prj/makefile.mk |1 xmlhelp/source/cxxhelp/provider/makefile.mk | 96 --- xmlhelp/source/cxxhelp/qe/makefile.mk | 51 -- xmlhelp/source/cxxhelp/util/makefile.mk | 52 --- xmlhelp/source/treeview/makefile.mk | 77 -- xmlhelp/util/makefile.mk| 95 --- 22 files changed, 314 insertions(+), 397 deletions(-) New commits: commit 21ec3dbaa600f4d13792a6ea49090083a8f1150b Author: David Tardon Date: Sat Apr 7 16:14:01 2012 +0200 move xmlhelp to tail_build diff --git a/Module_tail_build.mk b/Module_tail_build.mk index dcbbdda..44b8413 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -92,6 +92,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ writerfilter \ writerperfect \ xmerge \ +xmlhelp \ xmloff \ xmlscript \ xmlsecurity \ diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index 9b0442b..9d02e0c 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain VIGRA:vigra X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib basegfx bridges comphelper DBCONNECTIVITY:connectivity cppu cppuhelper cpputools i18npool i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar rsc sal salhelper sax shell solenv soltools sot stoc svl sysui tools ucbhelper udkapi unoil uno test unotools ure DESKTOP:xmlhelp xmlreader xsltml NULL +tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain VIGRA:vigra X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib basegfx bridges comphelper DBCONNECTIVITY:connectivity cppu cppuhelper cpputools i18npool i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar rsc sal salhelper sax shell solenv soltools sot stoc svl sysui tools ucbhelper udkapi unoil uno test unotools ure xmlreader xsltml NULL tb tail_build\prj nmake - all tb_prj NULL commit 69bd2f3630d83dbcab4cfb9d9ff7ccc6b7f2a139 Author: David Tardon Date: Sat Apr 7 16:12:22 2012 +0200 gbuildize xmlhelp diff --git a/Makefile b/Makefile index d412f16..1bfb75b 100644 --- a/Makefile +++ b/Makefile @@ -133,6 +133,7 @@ writerfilter\ writerperfect\ xmerge\ xml2cmp\ +xmlhelp\ xmloff\ xmlreader\ xmlscript\ @@ -236,7 +237,6 @@ udm\ unodevtools\ vigra\ x11_extensions\ -xmlhelp\ xpdf\ xsltml\ zlib\ diff --git a/Repository.mk b/Repository.mk index 8f72da9..7775190 100644 --- a/Repository.mk +++ b/Repository.mk @@ -381,10 +381,12 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ subsequenttest \ test \ textconv_dict \ +tvhlp1 \ ucb1 \ ucpdav1 \ ucpfile1 \ ucpftp1 \ +ucpchelp1 \
[Libreoffice-commits] .: Branch 'feature/svg-export' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gbuild_conversions' - svl/Library_svl.mk
svl/Library_svl.mk |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit c831076abe1a5d40b515ec64c29c86e6204bfbfd Author: David Tardon Date: Sat Apr 7 14:27:37 2012 +0200 make sure that rsc headers are available diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk index 5addf89..01d0c1d 100644 --- a/svl/Library_svl.mk +++ b/svl/Library_svl.mk @@ -28,7 +28,10 @@ $(eval $(call gb_Library_Library,svl)) -$(eval $(call gb_Library_add_package_headers,svl,svl_inc)) +$(eval $(call gb_Library_add_package_headers,svl,\ + rsc_inc \ + svl_inc \ +)) $(eval $(call gb_Library_set_componentfile,svl,svl/util/svl)) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'feature/svg-export'
New branch 'feature/svg-export' available with the following commits: commit ba2f66d3d81b18dac21864a81fe60a6142547978 Author: Marco Cecchetti Date: Sat Apr 7 12:08:30 2012 +0200 Now debug printers are turned off automatically commit ca0d85dfcc08a6dc6145343016b0b556fd1e5b0e Author: Marco Cecchetti Date: Sat Mar 31 12:00:35 2012 +0200 fixed wrong indentation / provided better indentation ___ 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/DocumentRenderer.cxx |6 +++---
sd/source/ui/view/ImpressViewShellBase.cxx |2 +-
sd/source/ui/view/ViewShellBase.cxx|5 ++---
sd/source/ui/view/drviews5.cxx |2 +-
sd/source/ui/view/frmview.cxx |2 +-
sd/source/ui/view/sdview4.cxx |4 ++--
6 files changed, 10 insertions(+), 11 deletions(-)
New commits:
commit 29598e43c4f1262314274d341532a0143255634b
Author: Olivier Hallot
Date: Sat Apr 7 09:02:24 2012 -0300
More OUString ctor simplifcations
remove more OUString explicit contructions
(make C++ strings look like Strings)
diff --git a/sd/source/ui/view/DocumentRenderer.cxx
b/sd/source/ui/view/DocumentRenderer.cxx
index 8a51c20..3ddb7d7 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -901,7 +901,7 @@ namespace {
const sal_uLong nDrawMode,
const Orientation eOrientation,
const sal_uInt16 nPaperTray)
-: PrinterPage(ePageKind, rMapMode, bPrintMarkedOnly,
::rtl::OUString(),
+: PrinterPage(ePageKind, rMapMode, bPrintMarkedOnly, "",
Point(), nDrawMode, eOrientation, nPaperTray),
mnFirstPageIndex(nFirstPageIndex),
mnSecondPageIndex(nSecondPageIndex),
@@ -2006,10 +2006,10 @@ private:
if (mpOptions->IsPrintPageName())
{
rInfo.msPageString = pPage->GetName();
-rInfo.msPageString += ::rtl::OUString(sal_Unicode(' '));
+rInfo.msPageString += rtl::OUString(sal_Unicode(' '));
}
else
-rInfo.msPageString = ::rtl::OUString();
+rInfo.msPageString = "";
rInfo.msPageString += rInfo.msTimeDate;
long aPageWidth = aPageSize.Width() - pPage->GetLftBorder() -
pPage->GetRgtBorder();
diff --git a/sd/source/ui/view/ImpressViewShellBase.cxx
b/sd/source/ui/view/ImpressViewShellBase.cxx
index 030e32b..eebc01a 100644
--- a/sd/source/ui/view/ImpressViewShellBase.cxx
+++ b/sd/source/ui/view/ImpressViewShellBase.cxx
@@ -50,7 +50,7 @@ SfxViewShell* ImpressViewShellBase::CreateInstance (
SfxViewFrame *pFrame, SfxViewShell *pOldView)
{
ImpressViewShellBase* pBase = new ImpressViewShellBase(pFrame, pOldView);
-pBase->LateInit(::rtl::OUString());
+pBase->LateInit("");
return pBase;
}
void ImpressViewShellBase::RegisterFactory( sal_uInt16 nPrio )
diff --git a/sd/source/ui/view/ViewShellBase.cxx
b/sd/source/ui/view/ViewShellBase.cxx
index 5ad0394..7f514f3 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -236,13 +236,12 @@ SfxViewShell* ViewShellBase::CreateInstance (
SfxViewFrame *pFrame, SfxViewShell *pOldView)
{
ViewShellBase* pBase = new ViewShellBase(pFrame, pOldView);
-pBase->LateInit(OUString());
+pBase->LateInit("");
return pBase;
}
void ViewShellBase::RegisterFactory( sal_uInt16 nPrio )
{
-pFactory = new SfxViewFactory(
-&CreateInstance,&InitFactory,nPrio,"Default");
+pFactory = new SfxViewFactory(
&CreateInstance,&InitFactory,nPrio,"Default" );
InitFactory();
}
void ViewShellBase::InitFactory()
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 673cfe8..62ebfda 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -551,7 +551,7 @@ void DrawViewShell::WriteUserDataSequence (
::com::sun::star::uno::Sequence < ::
const sal_Int32 nIndex = rSequence.getLength();
rSequence.realloc( nIndex + 1 );
-rSequence[nIndex].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
sUNO_View_ZoomOnPage ));
+rSequence[nIndex].Name = sUNO_View_ZoomOnPage ;
rSequence[nIndex].Value <<= (sal_Bool)mbZoomOnPage;
}
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index 8724d52..b55d15c 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -466,7 +466,7 @@ static OUString createHelpLinesString( const
SdrHelpLineList& rHelpLines )
return aLines.makeStringAndClear();
}
-#define addValue( n, v ) push_back( std::pair< OUString, Any >( OUString(
RTL_CONSTASCII_USTRINGPARAM( n ) ), v ) )
+#define addValue( n, v ) push_back( std::pair< OUString, Any >( OUString( n ),
v ) )
void FrameView::WriteUserDataSequence ( ::com::sun::star::uno::Sequence <
::com::sun::star::beans::PropertyValue >& rValues, sal_Bool )
{
std::vector< std::pair< OUString, Any > > aUserData;
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index bd919e5..030c9f6 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -488,8 +488,8 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl)
//TODO/MBA: testing
::rtl::OUString aName;
uno::Sequence < beans::PropertyValue > aMedium(1
[Libreoffice-commits] .: sd/source
sd/source/ui/view/DocumentRenderer.cxx | 38 -
sd/source/ui/view/sdview3.cxx | 13 ---
sd/source/ui/view/viewshe2.cxx | 24 +---
3 files changed, 35 insertions(+), 40 deletions(-)
New commits:
commit 09d46a68510a14862226f48503bbef798b8426e9
Author: Olivier Hallot
Date: Sat Apr 7 07:51:01 2012 -0300
More refactoring at OUString explicit constructors in sd
Remove some explicit OUString constructors in sd/.../ui
diff --git a/sd/source/ui/view/DocumentRenderer.cxx
b/sd/source/ui/view/DocumentRenderer.cxx
index 99b0ec3..8a51c20 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -419,7 +419,7 @@ namespace {
if( mbImpress )
{
vcl::PrinterOptionsHelper::UIControlOptions aPrintOpt;
-aPrintOpt.maGroupHint = rtl::OUString( "JobPage" );
+aPrintOpt.maGroupHint = "JobPage" ;
AddDialogControl(
vcl::PrinterOptionsHelper::getSubgroupControlOpt(
String(
SdResId(_STR_IMPRESS_PRINT_UI_PRINT_GROUP) ),
"",
@@ -427,7 +427,7 @@ namespace {
);
aHelpIds.realloc( 1 );
-aHelpIds[0] = rtl::OUString(
".HelpID:vcl:PrintDialog:PageContentType:ListBox" );
+aHelpIds[0] =
".HelpID:vcl:PrintDialog:PageContentType:ListBox" ;
AddDialogControl(
vcl::PrinterOptionsHelper::getChoiceControlOpt(
String( SdResId(
_STR_IMPRESS_PRINT_UI_CONTENT ) ),
aHelpIds,
@@ -438,7 +438,7 @@ namespace {
)
);
-aHelpIds[0] = rtl::OUString(
".HelpID:vcl:PrintDialog:SlidesPerPage:ListBox" );
+aHelpIds[0] = ".HelpID:vcl:PrintDialog:SlidesPerPage:ListBox" ;
vcl::PrinterOptionsHelper::UIControlOptions aContentOpt(
"PageContentType" , 1 );
AddDialogControl(
vcl::PrinterOptionsHelper::getChoiceControlOpt(
String( SdResId(
_STR_IMPRESS_PRINT_UI_SLIDESPERPAGE ) ),
@@ -452,7 +452,7 @@ namespace {
)
);
-aHelpIds[0] = rtl::OUString(
".HelpID:vcl:PrintDialog:SlidesPerPageOrder:ListBox" );
+aHelpIds[0] =
".HelpID:vcl:PrintDialog:SlidesPerPageOrder:ListBox" ;
vcl::PrinterOptionsHelper::UIControlOptions aSlidesPerPageOpt(
"SlidesPerPage" , -1, sal_True );
AddDialogControl(
vcl::PrinterOptionsHelper::getChoiceControlOpt(
String( SdResId(
_STR_IMPRESS_PRINT_UI_ORDER ) ),
@@ -514,9 +514,9 @@ namespace {
String( SdResId(_STR_IMPRESS_PRINT_UI_QUALITY)
), "" ) );
aHelpIds.realloc( 3 );
-aHelpIds[0] = rtl::OUString(
".HelpID:vcl:PrintDialog:Quality:RadioButton:0" );
-aHelpIds[1] = rtl::OUString(
".HelpID:vcl:PrintDialog:Quality:RadioButton:1" );
-aHelpIds[2] = rtl::OUString(
".HelpID:vcl:PrintDialog:Quality:RadioButton:2" );
+aHelpIds[0] = ".HelpID:vcl:PrintDialog:Quality:RadioButton:0" ;
+aHelpIds[1] = ".HelpID:vcl:PrintDialog:Quality:RadioButton:1" ;
+aHelpIds[2] = ".HelpID:vcl:PrintDialog:Quality:RadioButton:2" ;
AddDialogControl( vcl::PrinterOptionsHelper::getChoiceControlOpt(
"",
aHelpIds,
@@ -530,10 +530,10 @@ namespace {
String(
SdResId(_STR_IMPRESS_PRINT_UI_PAGE_OPTIONS) ), "" ) );
aHelpIds.realloc( 4 );
-aHelpIds[0] = rtl::OUString(
".HelpID:vcl:PrintDialog:PageOptions:RadioButton:0" );
-aHelpIds[1] = rtl::OUString(
".HelpID:vcl:PrintDialog:PageOptions:RadioButton:1" );
-aHelpIds[2] = rtl::OUString(
".HelpID:vcl:PrintDialog:PageOptions:RadioButton:2" );
-aHelpIds[3] = rtl::OUString(
".HelpID:vcl:PrintDialog:PageOptions:RadioButton:3" );
+aHelpIds[0] = ".HelpID:vcl:PrintDialog:PageOptions:RadioButton:0" ;
+aHelpIds[1] = ".HelpID:vcl:PrintDialog:PageOptions:RadioButton:1" ;
+aHelpIds[2] = ".HelpID:vcl:PrintDialog:PageOptions:RadioButton:2" ;
+aHelpIds[3] = ".HelpID:vcl:PrintDialog:PageOptions:RadioButton:3" ;
if( mbImpress )
{
// FIXME: additional dependency on PrintProspect = false
@@ -567,7 +567,7 @@ namespace {
}
vcl::PrinterOptionsHelper::UIControlOptions aBrochureOpt;
-aBrochureOpt.maGroupHint = OUString( "LayoutPage" );
+aBrochureOpt.maGroupHint = "LayoutPage" ;
AddDialogControl( vcl:
