editeng/inc/editeng/unofield.hxx | 3 -
editeng/source/editeng/impedit4.cxx | 25 ++++----
editeng/source/uno/unofield.cxx | 20 ++++++-
reportdesign/source/ui/report/ReportController.cxx | 2
reportdesign/source/ui/report/ReportSection.cxx | 3 -
sc/source/filter/inc/drawingmanager.hxx | 20 -------
sc/source/filter/oox/drawingmanager.cxx | 60 ---------------------
sw/source/core/txtnode/txtedt.cxx | 27 ++++-----
unusedcode.easy | 19 ++----
vcl/Library_vcl.mk | 6 ++
vcl/inc/vcl/gradient.hxx | 1
vcl/source/gdi/gradient.cxx | 10 ---
vcl/unx/generic/printer/ppdparser.cxx | 2
13 files changed, 62 insertions(+), 136 deletions(-)
New commits:
commit 4453b52924db6ed8843f7dce1b0664cdce387742
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu May 10 10:18:01 2012 +0100
callcatcher: update unused code list
Change-Id: I286988eabcc2d813008597b3657c366d510f8ab6
diff --git a/editeng/inc/editeng/unofield.hxx b/editeng/inc/editeng/unofield.hxx
index 39cf2e6..bbd2a1e 100644
--- a/editeng/inc/editeng/unofield.hxx
+++ b/editeng/inc/editeng/unofield.hxx
@@ -74,7 +74,8 @@ public:
SvxFieldData* CreateFieldData() const throw();
void SetAnchor( ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > xAnchor ) { mxAnchor = xAnchor; }
- UNO3_GETIMPLEMENTATION_DECL( SvxUnoTextField )
+ static const ::com::sun::star::uno::Sequence< sal_Int8 > &
getUnoTunnelId() throw();
+ virtual sal_Int64 SAL_CALL getSomething( const
::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier )
throw(::com::sun::star::uno::RuntimeException);
// ::com::sun::star::uno::XInterface
virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const
::com::sun::star::uno::Type & rType )
throw(::com::sun::star::uno::RuntimeException);
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index 4f4bb69..b0a51eb 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -253,7 +253,25 @@ inline Time setTime( util::DateTime& rDate )
// ====================================================================
// class SvxUnoTextField
// ====================================================================
-UNO3_GETIMPLEMENTATION_IMPL( SvxUnoTextField );
+namespace
+{
+ class theSvxUnoTextFieldUnoTunnelId : public rtl::Static< UnoTunnelIdInit,
theSvxUnoTextFieldUnoTunnelId> {};
+}
+
+const ::com::sun::star::uno::Sequence< sal_Int8 > &
SvxUnoTextField::getUnoTunnelId() throw()
+{
+ return theSvxUnoTextFieldUnoTunnelId::get().getSeq();
+}
+
+sal_Int64 SAL_CALL SvxUnoTextField::getSomething( const
::com::sun::star::uno::Sequence< sal_Int8 >& rId )
throw(::com::sun::star::uno::RuntimeException)
+{
+ if( rId.getLength() == 16 && 0 == rtl_compareMemory(
getUnoTunnelId().getConstArray(),
+ rId.getConstArray(),
16 ) )
+ {
+ return
sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(this));
+ }
+ return 0;
+}
SvxUnoTextField::SvxUnoTextField( sal_Int32 nServiceId ) throw()
: OComponentHelper( getMutex() )
diff --git a/sc/source/filter/inc/drawingmanager.hxx
b/sc/source/filter/inc/drawingmanager.hxx
index 6a1953c..f79a7b3 100644
--- a/sc/source/filter/inc/drawingmanager.hxx
+++ b/sc/source/filter/inc/drawingmanager.hxx
@@ -92,9 +92,6 @@ public:
/** Returns true, if the object list is empty. */
inline bool empty() const { return maObjects.empty(); }
- /** Tries to insert the passed object into the last group or appends it. */
- void insertGrouped( const BiffDrawingObjectRef&
rxDrawingObj );
-
/** Creates and inserts all UNO shapes into the passed shape container. */
void convertAndInsert( BiffDrawingBase& rDrawing,
const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShapes >& rxShapes,
@@ -145,15 +142,6 @@ public:
const ::com::sun::star::awt::Rectangle*
pParentRect = 0 ) const;
protected:
- /** Reads the object name in a BIFF5 OBJ record. */
- void readNameBiff5( BiffInputStream& rStrm, sal_uInt16
nNameLen );
- /** Reads the macro link in a BIFF3 OBJ record. */
- void readMacroBiff3( BiffInputStream& rStrm, sal_uInt16
nMacroSize );
- /** Reads the macro link in a BIFF4 OBJ record. */
- void readMacroBiff4( BiffInputStream& rStrm, sal_uInt16
nMacroSize );
- /** Reads the macro link in a BIFF5 OBJ record. */
- void readMacroBiff5( BiffInputStream& rStrm, sal_uInt16
nMacroSize );
-
/** Converts the passed line formatting to the passed property map. */
void convertLineProperties(
::oox::drawingml::ShapePropertyMap& rPropMap, const BiffObjLineModel&
rLineModel, sal_uInt16 nArrows = 0 ) const;
/** Converts the passed fill formatting to the passed property map. */
@@ -225,14 +213,6 @@ public:
/** Final processing after import of the all drawing objects. */
void finalizeImport();
- /** Creates a new UNO shape object, inserts it into the passed UNO shape
- container, and sets the shape position and size. */
- ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
- createAndInsertXShape(
- const ::rtl::OUString& rService,
- const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShapes >& rxShapes,
- const ::com::sun::star::awt::Rectangle& rShapeRect
) const;
-
/** Derived classes may want to know that a shape has been inserted. Will
be called from the convertAndInsert() implementation. */
virtual void notifyShapeInserted(
diff --git a/sc/source/filter/oox/drawingmanager.cxx
b/sc/source/filter/oox/drawingmanager.cxx
index 9f6f31d..25d166b 100644
--- a/sc/source/filter/oox/drawingmanager.cxx
+++ b/sc/source/filter/oox/drawingmanager.cxx
@@ -219,11 +219,6 @@ BiffDrawingObjectContainer::BiffDrawingObjectContainer()
{
}
-void BiffDrawingObjectContainer::insertGrouped( const BiffDrawingObjectRef&
rxDrawingObj )
-{
- maObjects.push_back( rxDrawingObj );
-}
-
void BiffDrawingObjectContainer::convertAndInsert( BiffDrawingBase& rDrawing,
const Reference< XShapes >& rxShapes, const Rectangle* pParentRect ) const
{
maObjects.forEachMem( &BiffDrawingObjectBase::convertAndInsert,
::boost::ref( rDrawing ), ::boost::cref( rxShapes ), pParentRect );
@@ -281,40 +276,6 @@ Reference< XShape >
BiffDrawingObjectBase::convertAndInsert( BiffDrawingBase& rD
return xShape;
}
-// protected ------------------------------------------------------------------
-
-void BiffDrawingObjectBase::readNameBiff5( BiffInputStream& rStrm, sal_uInt16
nNameLen )
-{
- maObjName = OUString();
- if( nNameLen > 0 )
- {
- // name length field is repeated before the name
- maObjName = rStrm.readByteStringUC( false, getTextEncoding() );
- // skip padding byte for word boundaries
- rStrm.alignToBlock( 2 );
- }
-}
-
-void BiffDrawingObjectBase::readMacroBiff3( BiffInputStream& rStrm, sal_uInt16
nMacroSize )
-{
- maMacroName = OUString();
- rStrm.skip( nMacroSize );
- // skip padding byte for word boundaries, not contained in nMacroSize
- rStrm.alignToBlock( 2 );
-}
-
-void BiffDrawingObjectBase::readMacroBiff4( BiffInputStream& rStrm, sal_uInt16
nMacroSize )
-{
- maMacroName = OUString();
- rStrm.skip( nMacroSize );
-}
-
-void BiffDrawingObjectBase::readMacroBiff5( BiffInputStream& rStrm, sal_uInt16
nMacroSize )
-{
- maMacroName = OUString();
- rStrm.skip( nMacroSize );
-}
-
void BiffDrawingObjectBase::convertLineProperties( ShapePropertyMap& rPropMap,
const BiffObjLineModel& rLineModel, sal_uInt16 nArrows ) const
{
if( rLineModel.mbAuto )
@@ -557,27 +518,6 @@ void BiffDrawingBase::finalizeImport()
maRawObjs.convertAndInsert( *this, xShapes );
}
-Reference< XShape > BiffDrawingBase::createAndInsertXShape( const OUString&
rService,
- const Reference< XShapes >& rxShapes, const Rectangle& rShapeRect )
const
-{
- OSL_ENSURE( !rService.isEmpty(), "BiffDrawingBase::createAndInsertXShape -
missing UNO shape service name" );
- OSL_ENSURE( rxShapes.is(), "BiffDrawingBase::createAndInsertXShape -
missing XShapes container" );
- Reference< XShape > xShape;
- if( !rService.isEmpty() && rxShapes.is() ) try
- {
- xShape.set( getBaseFilter().getModelFactory()->createInstance(
rService ), UNO_QUERY_THROW );
- // insert shape into passed shape collection (maybe drawpage or group
shape)
- rxShapes->add( xShape );
- xShape->setPosition( Point( rShapeRect.X, rShapeRect.Y ) );
- xShape->setSize( Size( rShapeRect.Width, rShapeRect.Height ) );
- }
- catch( Exception& )
- {
- }
- OSL_ENSURE( xShape.is(), "BiffDrawingBase::createAndInsertXShape - cannot
instanciate shape object" );
- return xShape;
-}
-
// ============================================================================
BiffSheetDrawing::BiffSheetDrawing( const WorksheetHelper& rHelper ) :
diff --git a/unusedcode.easy b/unusedcode.easy
index 2684713..0f841e9 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -30,6 +30,10 @@ ScAddInDocs::Insert(ScDocument* const&, unsigned short&)
ScAddInDocs::Insert(ScDocument* const*, unsigned short)
ScAddInDocs::Remove(ScDocument* const&, unsigned short)
ScChartListener::SetName(rtl::OUString const&)
+ScColorScaleFormatList::begin()
+ScColorScaleFormatList::begin() const
+ScColorScaleFormatList::end()
+ScColorScaleFormatList::end() const
ScCompressedArray<int, unsigned char>::GetEntryCount() const
ScCompressedArray<int, unsigned short>::CopyFrom(ScCompressedArray<int,
unsigned short> const&, int, int, long)
ScCompressedArray<int, unsigned short>::GetEntryCount() const
@@ -39,11 +43,6 @@ ScCompressedArray<int, unsigned short>::Remove(int, unsigned
long)
ScCompressedArray<int, unsigned short>::ScCompressedArray(int, unsigned short
const&, unsigned long)
ScCompressedArray<int, unsigned short>::ScCompressedArray(int, unsigned short
const*, unsigned long)
ScCompressedArray<int, unsigned short>::SetValue(int, unsigned short const&)
-ScConditionalFormats_Impl::Insert(ScConditionalFormat* const&, unsigned short&)
-ScConditionalFormats_Impl::Insert(ScConditionalFormat* const*, unsigned short)
-ScConditionalFormats_Impl::Insert(ScConditionalFormats_Impl const*, unsigned
short, unsigned short)
-ScConditionalFormats_Impl::Remove(ScConditionalFormat* const&, unsigned short)
-ScConditionalFormats_Impl::Remove(unsigned short, unsigned short)
ScCsvControl::ScCsvControl(Window*, ScCsvLayoutData const&, long)
ScDBCollection::AnonDBs::erase(boost::void_ptr_iterator<__gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<void**,
std::__cxx1998::vector<void*, std::allocator<void*> > >,
std::__debug::vector<void*, std::allocator<void*> > >, ScDBData>)
ScDBCollection::AnonDBs::findByTable(short) const
@@ -149,7 +148,6 @@ SwCurrShells::Insert(CurrShell* const&, unsigned short&)
SwCurrShells::Insert(CurrShell* const*, unsigned short)
SwCurrShells::Insert(SwCurrShells const*, unsigned short, unsigned short)
SwCurrShells::Remove(unsigned short, unsigned short)
-SwDependentFields::DeleteAndDestroy(unsigned short, unsigned short)
SwDestroyList::DeleteAndDestroy(unsigned short, unsigned short)
SwDestroyList::Insert(SwDestroyList const*, unsigned short, unsigned short)
SwDestroyList::Insert(SwSectionFrm* const&, unsigned short&)
@@ -160,11 +158,6 @@ SwGlblDocContents::Insert(SwGlblDocContent* const&,
unsigned short&)
SwGlblDocContents::Insert(SwGlblDocContent* const*, unsigned short)
SwGlblDocContents::Insert(SwGlblDocContents const*, unsigned short, unsigned
short)
SwGlblDocContents::Remove(SwGlblDocContent* const&, unsigned short)
-SwHTMLFmtInfos::Insert(SwHTMLFmtInfo const*&, unsigned short&)
-SwHTMLFmtInfos::Insert(SwHTMLFmtInfo const**, unsigned short)
-SwHTMLFmtInfos::Insert(SwHTMLFmtInfos const*, unsigned short, unsigned short)
-SwHTMLFmtInfos::Remove(SwHTMLFmtInfo const*&, unsigned short)
-SwHTMLFmtInfos::Remove(unsigned short, unsigned short)
SwHTMLPosFlyFrms::Insert(SwHTMLPosFlyFrm* const&, unsigned short&)
SwHTMLPosFlyFrms::Insert(SwHTMLPosFlyFrm* const*, unsigned short)
SwHTMLPosFlyFrms::Insert(SwHTMLPosFlyFrms const*, unsigned short, unsigned
short)
@@ -192,6 +185,8 @@ SwRedlineDataParentSortArr::Insert(SwRedlineDataParent*
const&)
SwRedlineDataParentSortArr::Insert(SwRedlineDataParent* const*, unsigned short)
SwRedlineDataParentSortArr::Insert(SwRedlineDataParentSortArr const*, unsigned
short, unsigned short)
SwSections::DeleteAndDestroy(unsigned short, unsigned short)
+SwSelBoxes::Insert(SwTableBox* const&, unsigned short&)
+SwSelBoxes::Remove(SwTableBox* const&, unsigned short)
SwSortElements::Insert(SwSortElement* const&, unsigned short&)
SwSortElements::Insert(SwSortElement* const*, unsigned short)
SwSortElements::Insert(SwSortElements const*, unsigned short, unsigned short)
@@ -292,7 +287,6 @@ _SfxObjectList::Insert(_FileListEntry const**, unsigned
short)
_SfxObjectList::Insert(_SfxObjectList const*, unsigned short, unsigned short)
_SfxObjectList::Remove(_FileListEntry const*&, unsigned short)
_SfxObjectList::Remove(unsigned short, unsigned short)
-_SfxPoolItems::DeleteAndDestroy(unsigned short, unsigned short)
_SwFtnIdxs::Insert(SwTxtFtn* const&, unsigned short&)
_SwFtnIdxs::Insert(SwTxtFtn* const*, unsigned short)
_SwFtnIdxs::Remove(SwTxtFtn* const&, unsigned short)
@@ -686,6 +680,7 @@
nullcanvas::SpriteCanvasHelper::genericUpdate(basegfx::B2DConnectedRanges<canvas
nullcanvas::SpriteCanvasHelper::opaqueUpdate(basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents
const&)
nullcanvas::SpriteCanvasHelper::scrollUpdate(basegfx::B2DRange const&,
basegfx::B2DRange const&,
basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents
const&)
oox::PropertyMap::dump(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>)
+oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper
const&)
oox::xls::CellBlock::CellBlock(oox::xls::WorksheetHelper const&,
oox::ValueRange const&, int)
sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
diff --git a/vcl/inc/vcl/gradient.hxx b/vcl/inc/vcl/gradient.hxx
index 1ed0c12..382b245 100644
--- a/vcl/inc/vcl/gradient.hxx
+++ b/vcl/inc/vcl/gradient.hxx
@@ -88,7 +88,6 @@ private:
public:
Gradient();
Gradient( const Gradient& rGradient );
- Gradient( GradientStyle eStyle );
Gradient( GradientStyle eStyle,
const Color& rStartColor,
const Color& rEndColor );
diff --git a/vcl/source/gdi/gradient.cxx b/vcl/source/gdi/gradient.cxx
index ce9a75f..af648a1 100644
--- a/vcl/source/gdi/gradient.cxx
+++ b/vcl/source/gdi/gradient.cxx
@@ -106,16 +106,6 @@ Gradient::Gradient( const Gradient& rGradient )
// -----------------------------------------------------------------------
-Gradient::Gradient( GradientStyle eStyle )
-{
- DBG_CTOR( Gradient, NULL );
-
- mpImplGradient = new Impl_Gradient;
- mpImplGradient->meStyle = eStyle;
-}
-
-// -----------------------------------------------------------------------
-
Gradient::Gradient( GradientStyle eStyle,
const Color& rStartColor, const Color& rEndColor )
{
commit 7080d629c82422a419d38051536c7711f8abe53e
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu May 10 10:15:34 2012 +0100
Resolves: fdo#37044 two different TransliterationChgData structs
There are two structs called TransliterationChgData with different
layout. The crashes on MacOSX must be due to this. Rename them
so they've different names.
Change-Id: I887a33bed26b339e229b7fb1ef8dddd192f6fae3
diff --git a/editeng/source/editeng/impedit4.cxx
b/editeng/source/editeng/impedit4.cxx
index f9b8e86..8eb912f 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -2673,16 +2673,17 @@ void ImpEditEngine::SetAutoCompleteText( const String&
rStr, sal_Bool bClearTipW
Help::ShowQuickHelp( pActiveView->GetWindow(), Rectangle(), String(),
0 );
}
-
-struct TransliterationChgData
+namespace
{
- sal_uInt16 nStart;
- xub_StrLen nLen;
- EditSelection aSelection;
- String aNewText;
- uno::Sequence< sal_Int32 > aOffsets;
-};
-
+ struct eeTransliterationChgData
+ {
+ sal_uInt16 nStart;
+ xub_StrLen nLen;
+ EditSelection aSelection;
+ String aNewText;
+ uno::Sequence< sal_Int32 > aOffsets;
+ };
+}
EditSelection ImpEditEngine::TransliterateText( const EditSelection&
rSelection, sal_Int32 nTransliterationMode )
{
@@ -2736,8 +2737,8 @@ EditSelection ImpEditEngine::TransliterateText( const
EditSelection& rSelection,
//! This way the offsets for the yet to be changed words will be
//! left unchanged by the already replaced text.
//! For this we temporarily save the changes to be done in this vector
- std::vector< TransliterationChgData > aChanges;
- TransliterationChgData aChgData;
+ std::vector< eeTransliterationChgData > aChanges;
+ eeTransliterationChgData aChgData;
if (nTransliterationMode ==
i18n::TransliterationModulesExtra::TITLE_CASE)
{
@@ -2960,7 +2961,7 @@ EditSelection ImpEditEngine::TransliterateText( const
EditSelection& rSelection,
// yet unchanged text parts remain the same.
for (size_t i = 0; i < aChanges.size(); ++i)
{
- TransliterationChgData& rData = aChanges[ aChanges.size() - 1
- i ];
+ eeTransliterationChgData& rData = aChanges[ aChanges.size() -
1 - i ];
bChanges = sal_True;
if (rData.nLen != rData.aNewText.Len())
diff --git a/sw/source/core/txtnode/txtedt.cxx
b/sw/source/core/txtnode/txtedt.cxx
index 5da2164..f65bfe9 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -1543,13 +1543,16 @@ sal_Bool SwTxtNode::Hyphenate( SwInterHyphInfo
&rHyphInf )
return sal_False;
}
-struct TransliterationChgData
+namespace
{
- xub_StrLen nStart;
- xub_StrLen nLen;
- String sChanged;
- Sequence< sal_Int32 > aOffsets;
-};
+ struct swTransliterationChgData
+ {
+ xub_StrLen nStart;
+ xub_StrLen nLen;
+ String sChanged;
+ Sequence< sal_Int32 > aOffsets;
+ };
+}
// change text to Upper/Lower/Hiragana/Katagana/...
void SwTxtNode::TransliterateText(
@@ -1572,8 +1575,8 @@ void SwTxtNode::TransliterateText(
//! This way the offsets for the yet to be changed words will be
//! left unchanged by the already replaced text.
//! For this we temporarily save the changes to be done in this vector
- std::vector< TransliterationChgData > aChanges;
- TransliterationChgData aChgData;
+ std::vector< swTransliterationChgData > aChanges;
+ swTransliterationChgData aChgData;
if (rTrans.getType() ==
(sal_uInt32)TransliterationModulesExtra::TITLE_CASE)
{
@@ -1771,7 +1774,7 @@ void SwTxtNode::TransliterateText(
// yet unchanged text parts remain the same.
for (size_t i = 0; i < aChanges.size(); ++i)
{
- TransliterationChgData &rData = aChanges[ aChanges.size() - 1
- i ];
+ swTransliterationChgData &rData = aChanges[ aChanges.size() -
1 - i ];
if (pUndo)
pUndo->AddChanges( *this, rData.nStart, rData.nLen,
rData.aOffsets );
ReplaceTextOnly( rData.nStart, rData.nLen, rData.sChanged,
rData.aOffsets );
commit c1324a518dc7506eb857180151f50c3a16023e04
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu May 10 10:03:03 2012 +0100
ditch temporary unused Strings
Change-Id: Ie4e27ed027761748e45f2ed6b97b236f742c01be
diff --git a/sw/source/core/txtnode/txtedt.cxx
b/sw/source/core/txtnode/txtedt.cxx
index ae8fe55..5da2164 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -1616,9 +1616,6 @@ void SwTxtNode::TransliterateText(
nEnd = (xub_StrLen)aCurWordBndry.endPos;
sal_Int32 nLen = nEnd - nStt;
OSL_ENSURE( nLen > 0, "invalid word length of 0" );
-#if OSL_DEBUG_LEVEL > 1
- String aText( GetTxt().Copy( nStt, nLen ) );
-#endif
Sequence <sal_Int32> aOffsets;
String sChgd( rTrans.transliterate( GetTxt(), GetLang( nStt ),
nStt, nLen, &aOffsets ));
@@ -1699,9 +1696,6 @@ void SwTxtNode::TransliterateText(
{
sal_Int32 nLen = nCurrentEnd - nCurrentStart;
OSL_ENSURE( nLen > 0, "invalid word length of 0" );
-#if OSL_DEBUG_LEVEL > 1
- String aText( GetTxt().Copy( nCurrentStart, nLen ) );
-#endif
Sequence <sal_Int32> aOffsets;
String sChgd( rTrans.transliterate( GetTxt(),
commit 9cee212202aa08fef7c7478608ceacebc8693a46
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu May 10 09:19:24 2012 +0100
fix use of cups for default case
27abb730b290f3516582d2d787ef64af76663f97 broke printing
Change-Id: Ib1cd9b31c7e3e5644b5207cb28c4fd178837c19d
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index a5b1848..bf03be2 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -436,6 +436,12 @@ $(eval $(call gb_Library_add_defs,vcl,\
) \
))
+ifeq ($(ENABLE_CUPS),YES)
+$(eval $(call gb_Library_add_defs,vcl,\
+ -DENABLE_CUPS\
+))
+endif
+
ifeq ($(GUIBASE),unx)
$(eval $(call gb_Library_add_defs,vcl,\
-DSAL_DLLPREFIX=\"$(gb_Library_SYSPRE)\" \
diff --git a/vcl/unx/generic/printer/ppdparser.cxx
b/vcl/unx/generic/printer/ppdparser.cxx
index 9acee56..4516497 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -655,7 +655,7 @@ const PPDParser* PPDParser::getParser( const String& rFile )
PrinterInfoManager& rMgr = PrinterInfoManager::get();
if( rMgr.getType() == PrinterInfoManager::CUPS )
{
-#if defined HAVE_CUPS_H
+#ifdef ENABLE_CUPS
pNewParser =
const_cast<PPDParser*>(static_cast<CUPSManager&>(rMgr).createCUPSParser( aFile
));
#endif
}
commit 5f1d65fe21a1690bb31736ebada13380554d9c82
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu May 10 08:35:54 2012 +0100
WaE: msvc2008 C4928 copy-ctor confusion
Change-Id: Id086aedc27977b4ca81299a00a340a65284118b8
diff --git a/reportdesign/source/ui/report/ReportController.cxx
b/reportdesign/source/ui/report/ReportController.cxx
index ae45e44..13de532 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -257,7 +257,7 @@ void lcl_getReportControlFormat(const Sequence<
PropertyValue >& aArgs,
}
else
{
- uno::Reference<uno::XInterface> xInterface = xReportControlFormat;
+ uno::Reference<uno::XInterface> xInterface(xReportControlFormat);
_rControlsFormats.push_back(xInterface);
}
diff --git a/reportdesign/source/ui/report/ReportSection.cxx
b/reportdesign/source/ui/report/ReportSection.cxx
index dbc6715..fe02710 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -727,8 +727,7 @@ void
OReportSection::fillControlModelSelection(::std::vector< uno::Reference< un
const OObjectBase* pObj = dynamic_cast<const
OObjectBase*>(pDlgEdObj);
if ( pObj )
{
- uno::Reference<uno::XInterface> xInterface =
- pObj->getReportComponent();
+ uno::Reference<uno::XInterface>
xInterface(pObj->getReportComponent());
_rSelection.push_back(xInterface);
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
