[Libreoffice-commits] .: 18 commits - basctl/source basic/inc basic/source bin/get-bugzilla-attachments-by-mimetype comphelper/inc comphelper/source cui/source dbaccess/source desktop/source extensions/source filter/source fpicker/source framework/inc framework/source o3tl/inc o3tl/qa oox/inc oox/source padmin/source sc/source sdext/source sd/source sd/util sfx2/inc sfx2/source starmath/source svl/inc svl/source svtools/inc svtools/source svx/inc svx/source sw/inc sw/source tools/inc tools/source unusedcode.easy vcl/source xmloff/inc xmloff/source
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Mar 20 05:58:05 PDT 2012
basctl/source/basicide/baside2.hxx | 2
basctl/source/basicide/baside2b.cxx | 2
basctl/source/basicide/moduldl2.cxx | 17
basctl/source/basicide/moduldlg.cxx | 4
basctl/source/basicide/moduldlg.hxx | 4
basic/inc/basic/sbx.hxx | 1
basic/inc/basic/sbxcore.hxx | 1
basic/inc/basic/sbxfac.hxx | 1
basic/source/sbx/sbxvalue.cxx | 2
bin/get-bugzilla-attachments-by-mimetype | 3
comphelper/inc/comphelper/mimeconfighelper.hxx | 4
comphelper/source/misc/mimeconfighelper.cxx | 52 +-
cui/source/dialogs/hlinettp.cxx | 4
dbaccess/source/ui/control/dbtreelistbox.cxx | 4
dbaccess/source/ui/dlg/indexdialog.cxx | 9
dbaccess/source/ui/inc/dbtreelistbox.hxx | 2
dbaccess/source/ui/inc/indexdialog.hxx | 2
desktop/source/app/app.cxx | 80 +--
desktop/source/app/cmdlinehelp.cxx | 18
desktop/source/deployment/gui/dp_gui_service.cxx | 55 +-
extensions/source/propctrlr/selectlabeldialog.cxx | 20
extensions/source/propctrlr/taborder.cxx | 2
extensions/source/update/tools/ztool.cxx | 4
filter/source/config/fragments/types/impress_CGM_Computer_Graphics_Metafile.xcu | 2
fpicker/source/office/iodlg.cxx | 6
framework/inc/macros/xserviceinfo.hxx | 10
framework/inc/tabwin/tabwindow.hxx | 2
framework/source/tabwin/tabwindow.cxx | 2
o3tl/inc/o3tl/cow_wrapper.hxx | 2
o3tl/qa/test-cow_wrapper.cxx | 9
oox/inc/oox/drawingml/textbodyproperties.hxx | 1
oox/inc/oox/drawingml/textliststyle.hxx | 4
oox/inc/oox/export/chartexport.hxx | 5
oox/source/drawingml/chart/objectformatter.cxx | 14
oox/source/drawingml/fillproperties.cxx | 5
oox/source/drawingml/shape.cxx | 12
oox/source/drawingml/textbodyproperties.cxx | 5
oox/source/drawingml/textliststyle.cxx | 11
oox/source/export/ColorPropertySet.cxx | 10
oox/source/export/ColorPropertySet.hxx | 3
oox/source/export/chartexport.cxx | 187 --------
oox/source/export/drawingml.cxx | 35 -
padmin/source/pamain.cxx | 8
sc/source/ui/unoobj/scdetect.cxx | 2
sc/source/ui/unoobj/scdetect.hxx | 2
sd/source/ui/animations/CustomAnimationDialog.cxx | 12
sd/source/ui/unoidl/sddetect.cxx | 2
sd/source/ui/unoidl/sddetect.hxx | 2
sd/util/sd.flt | 135 ------
sdext/source/presenter/PresenterScrollBar.cxx | 185 --------
sdext/source/presenter/PresenterScrollBar.hxx | 32 -
sdext/source/presenter/PresenterSlideSorter.cxx | 221 +---------
sdext/source/presenter/PresenterSlideSorter.hxx | 1
sfx2/inc/docvor.hxx | 2
sfx2/inc/sfx2/sfxuno.hxx | 23 -
sfx2/source/doc/docvor.cxx | 6
starmath/source/parse.cxx | 10
starmath/source/smdetect.cxx | 2
starmath/source/smdetect.hxx | 2
svl/inc/svl/adrparse.hxx | 49 +-
svl/inc/svl/cenumitm.hxx | 2
svl/inc/svl/filerec.hxx | 6
svl/inc/svl/fstathelper.hxx | 8
svl/inc/svl/visitem.hxx | 2
svl/source/filerec/filerec.cxx | 20
svl/source/items/cenumitm.cxx | 7
svl/source/items/visitem.cxx | 7
svl/source/misc/adrparse.cxx | 106 ++--
svl/source/misc/fstathelper.cxx | 6
svtools/inc/svtools/filectrl.hxx | 6
svtools/inc/svtools/filedlg.hxx | 7
svtools/inc/svtools/fileview.hxx | 4
svtools/inc/svtools/ivctrl.hxx | 2
svtools/inc/svtools/svlbitm.hxx | 2
svtools/inc/svtools/svtreebx.hxx | 2
svtools/source/contnr/fileview.cxx | 6
svtools/source/contnr/ivctrl.cxx | 2
svtools/source/contnr/svlbitm.cxx | 13
svtools/source/contnr/svtreebx.cxx | 2
svtools/source/dialogs/filedlg.cxx | 4
svtools/source/uno/treecontrolpeer.cxx | 11
svtools/source/uno/treecontrolpeer.hxx | 2
svx/inc/svx/sdooitm.hxx | 2
svx/inc/svx/sdynitm.hxx | 2
svx/source/form/filtnav.cxx | 2
svx/source/form/navigatortree.cxx | 2
svx/source/inc/filtnav.hxx | 2
svx/source/inc/fmexpl.hxx | 2
svx/source/svdraw/svdattr.cxx | 14
svx/source/svdraw/svdibrow.cxx | 61 +-
sw/inc/mdiexp.hxx | 6
sw/inc/swtypes.hxx | 2
sw/inc/toxinit.hxx | 40 -
sw/inc/viewopt.hxx | 12
sw/source/filter/html/parcss1.cxx | 2
sw/source/filter/ww8/ww8par.cxx | 2
sw/source/ui/docvw/edtwin3.cxx | 6
sw/source/ui/fldui/fldvar.cxx | 2
sw/source/ui/inc/dialmgr.hxx | 3
sw/source/ui/uno/swdetect.cxx | 2
sw/source/ui/uno/swdetect.hxx | 2
tools/inc/tools/config.hxx | 2
tools/inc/tools/inetmime.hxx | 8
tools/inc/tools/rc.hxx | 6
tools/inc/tools/resid.hxx | 2
tools/inc/tools/resmgr.hxx | 2
tools/inc/tools/string.hxx | 4
tools/source/generic/config.cxx | 2
tools/source/inet/inetmime.cxx | 10
tools/source/rc/resmgr.cxx | 8
tools/source/string/strucvt.cxx | 85 +--
tools/source/string/tustring.cxx | 18
unusedcode.easy | 80 +--
vcl/source/control/field.cxx | 2
xmloff/inc/xmloff/i18nmap.hxx | 53 +-
xmloff/source/core/i18nmap.cxx | 98 ----
116 files changed, 578 insertions(+), 1509 deletions(-)
New commits:
commit c2dc50c34b2b0797c4a1b468cc723d2f6b63572b
Author: Petr Vorel <petr.vorel at gmail.com>
Date: Tue Mar 20 12:43:30 2012 +0000
removed unused code
diff --git a/oox/inc/oox/drawingml/textbodyproperties.hxx b/oox/inc/oox/drawingml/textbodyproperties.hxx
index e155d30..adb9c1f 100644
--- a/oox/inc/oox/drawingml/textbodyproperties.hxx
+++ b/oox/inc/oox/drawingml/textbodyproperties.hxx
@@ -47,7 +47,6 @@ struct TextBodyProperties
explicit TextBodyProperties();
- void pushToPropMap( PropertyMap& rPropMap ) const;
void pushVertSimulation();
};
diff --git a/oox/inc/oox/drawingml/textliststyle.hxx b/oox/inc/oox/drawingml/textliststyle.hxx
index 5ce8ef7..29d8f29 100644
--- a/oox/inc/oox/drawingml/textliststyle.hxx
+++ b/oox/inc/oox/drawingml/textliststyle.hxx
@@ -51,10 +51,6 @@ public:
inline const TextParagraphPropertiesVector& getAggregationListStyle() const { return maAggregationListStyle; };
inline TextParagraphPropertiesVector& getAggregationListStyle() { return maAggregationListStyle; };
-#if OSL_DEBUG_LEVEL > 0
- void dump() const;
-#endif
-
protected:
TextParagraphPropertiesVector maListStyle;
diff --git a/oox/inc/oox/export/chartexport.hxx b/oox/inc/oox/export/chartexport.hxx
index 5bca83f..e041c38 100644
--- a/oox/inc/oox/export/chartexport.hxx
+++ b/oox/inc/oox/export/chartexport.hxx
@@ -157,9 +157,6 @@ private:
::com::sun::star::uno::Reference<
::com::sun::star::chart2::XDataSeries > > & aSeriesSeq,
sal_Bool bJapaneseCandleSticks, sal_Int32& nAttachedAxis );
- void exportDataSeq(
- const com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xValueSeq,
- sal_Int32 elementTokenId );
void exportSeriesText(
const com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xValueSeq );
void exportSeriesCategory(
@@ -176,8 +173,6 @@ private:
void exportFirstSliceAng();
void exportAxes( );
- void exportXAxis( AxisIdPair aAxisIdPair );
- void exportYAxis( AxisIdPair aAxisIdPair );
void exportAxis( AxisIdPair aAxisIdPair );
void _exportAxis(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xAxisProp,
diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx
index ab9e4cc..2dfdaf9 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -728,11 +728,6 @@ public:
PropertySet& rPropSet,
const TextCharacterProperties& rTextProps );
- /** Sets automatic line properties to the passed property set. */
- void convertAutomaticLine(
- PropertySet& rPropSet,
- sal_Int32 nSeriesIdx );
-
/** Sets automatic fill properties to the passed property set. */
void convertAutomaticFill(
PropertySet& rPropSet,
@@ -1017,15 +1012,6 @@ void ObjectTypeFormatter::convertTextFormatting( PropertySet& rPropSet, const Te
maTextFormatter.convertFormatting( rPropSet, &rTextProps );
}
-void ObjectTypeFormatter::convertAutomaticLine( PropertySet& rPropSet, sal_Int32 nSeriesIdx )
-{
- ShapePropertyMap aPropMap( mrModelObjHelper, *mrEntry.mpPropInfo );
- ModelRef< Shape > xShapeProp;
- maLineFormatter.convertFormatting( aPropMap, xShapeProp, nSeriesIdx );
- maEffectFormatter.convertFormatting( aPropMap, xShapeProp, nSeriesIdx );
- rPropSet.setProperties( aPropMap );
-}
-
void ObjectTypeFormatter::convertAutomaticFill( PropertySet& rPropSet, sal_Int32 nSeriesIdx )
{
ShapePropertyMap aPropMap( mrModelObjHelper, *mrEntry.mpPropInfo );
diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx
index 0a49985..07df75d 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -376,11 +376,6 @@ void FillProperties::pushToPropMap( ShapePropertyMap& rPropMap,
// ============================================================================
-void GraphicProperties::assignUsed( const GraphicProperties& rSourceProps )
-{
- maBlipProps.assignUsed( rSourceProps.maBlipProps );
-}
-
void GraphicProperties::pushToPropMap( PropertyMap& rPropMap, const GraphicHelper& rGraphicHelper, sal_Int32 nPhClr ) const
{
if( maBlipProps.mxGraphic.is() )
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index a2e29c5..d9f30f7 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -584,18 +584,6 @@ Reference< XShape > Shape::createAndInsert(
return mxShape;
}
-// the properties of rSource which are not part of rDest are being put into rDest
-void addMissingProperties( const PropertyMap& rSource, PropertyMap& rDest )
-{
- PropertyMap::const_iterator aSourceIter( rSource.begin() );
- while( aSourceIter != rSource.end() )
- {
- if ( rDest.find( (*aSourceIter ).first ) == rDest.end() )
- rDest[ (*aSourceIter).first ] <<= (*aSourceIter).second;
- ++aSourceIter;
- }
-}
-
void Shape::setTextBody(const TextBodyPtr & pTextBody)
{
mpTextBody = pTextBody;
diff --git a/oox/source/drawingml/textbodyproperties.cxx b/oox/source/drawingml/textbodyproperties.cxx
index b79883a..d007647 100644
--- a/oox/source/drawingml/textbodyproperties.cxx
+++ b/oox/source/drawingml/textbodyproperties.cxx
@@ -45,11 +45,6 @@ TextBodyProperties::TextBodyProperties():
{
}
-void TextBodyProperties::pushToPropMap( PropertyMap& rPropMap ) const
-{
- rPropMap.insert( maPropertyMap.begin(), maPropertyMap.end() );
-}
-
/* For Legacy purposes: TODO: Check if it is required at all! */
void TextBodyProperties::pushVertSimulation()
{
diff --git a/oox/source/drawingml/textliststyle.cxx b/oox/source/drawingml/textliststyle.cxx
index 663a5d5..520c5d6 100644
--- a/oox/source/drawingml/textliststyle.cxx
+++ b/oox/source/drawingml/textliststyle.cxx
@@ -66,17 +66,6 @@ void TextListStyle::apply( const TextListStyle& rTextListStyle )
applyStyleList( rTextListStyle.getListStyle(), getListStyle() );
}
-#ifdef DBG_UTIL
-void TextListStyle::dump() const
-{
- for ( int i = 0; i < 9; i++ )
- {
- OSL_TRACE("text list style level: %d", i);
- maListStyle[i]->dump();
- }
-}
-#endif
-
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/export/ColorPropertySet.cxx b/oox/source/export/ColorPropertySet.cxx
index 5c88ed8..eb10b35 100644
--- a/oox/source/export/ColorPropertySet.cxx
+++ b/oox/source/export/ColorPropertySet.cxx
@@ -111,16 +111,6 @@ ColorPropertySet::ColorPropertySet( sal_Int32 nColor, bool bFillColor /* = true
ColorPropertySet::~ColorPropertySet()
{}
-void ColorPropertySet::setColor( sal_Int32 nColor )
-{
- m_nColor = nColor;
-}
-
-sal_Int32 ColorPropertySet::getColor()
-{
- return m_nColor;
-}
-
// ____ XPropertySet ____
Reference< XPropertySetInfo > SAL_CALL ColorPropertySet::getPropertySetInfo()
diff --git a/oox/source/export/ColorPropertySet.hxx b/oox/source/export/ColorPropertySet.hxx
index 0da33fc..3b3c20d 100644
--- a/oox/source/export/ColorPropertySet.hxx
+++ b/oox/source/export/ColorPropertySet.hxx
@@ -47,9 +47,6 @@ public:
explicit ColorPropertySet( sal_Int32 nColor, bool bFillColor = true );
virtual ~ColorPropertySet();
- void setColor( sal_Int32 nColor );
- sal_Int32 getColor();
-
protected:
// ____ XPropertySet ____
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index bdf5219..879509a 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -357,20 +357,6 @@ OUString lcl_ConvertRange( const ::rtl::OUString & rRange, const Reference< char
typedef ::std::pair< OUString, OUString > tLabelAndValueRange;
-sal_Int32 lcl_getSequenceLengthByRole(
- const Sequence< Reference< chart2::data::XLabeledDataSequence > > & aSeqCnt,
- const OUString & rRole )
-{
- Reference< chart2::data::XLabeledDataSequence > xLabeledSeq(
- lcl_getDataSequenceByRole( aSeqCnt, rRole ));
- if( xLabeledSeq.is())
- {
- Reference< chart2::data::XDataSequence > xSeq( xLabeledSeq->getValues());
- return xSeq->getData().getLength();
- }
- return 0;
-}
-
OUString lcl_flattenStringSequence( const Sequence< OUString > & rSequence )
{
OUStringBuffer aResult;
@@ -432,26 +418,6 @@ void lcl_fillCategoriesIntoStringVector(
}
}
-double lcl_getValueFromSequence( const Reference< chart2::data::XDataSequence > & xSeq, sal_Int32 nIndex )
-{
- double fResult = 0.0;
- ::rtl::math::setNan( &fResult );
- Reference< chart2::data::XNumericalDataSequence > xNumSeq( xSeq, uno::UNO_QUERY );
- if( xNumSeq.is())
- {
- Sequence< double > aValues( xNumSeq->getNumericalData());
- if( nIndex < aValues.getLength() )
- fResult = aValues[nIndex];
- }
- else
- {
- Sequence< uno::Any > aAnies( xSeq->getData());
- if( nIndex < aAnies.getLength() )
- aAnies[nIndex] >>= fResult;
- }
- return fResult;
-}
-
::std::vector< double > lcl_getAllValuesFromSequence( const Reference< chart2::data::XDataSequence > & xSeq )
{
double fNan = 0.0;
@@ -475,31 +441,6 @@ double lcl_getValueFromSequence( const Reference< chart2::data::XDataSequence >
return aResult;
}
-bool lcl_SequenceHasUnhiddenData( const uno::Reference< chart2::data::XDataSequence >& xDataSequence )
-{
- if( !xDataSequence.is() )
- return false;
- uno::Reference< beans::XPropertySet > xProp( xDataSequence, uno::UNO_QUERY );
- if( xProp.is() )
- {
- uno::Sequence< sal_Int32 > aHiddenValues;
- try
- {
- xProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "HiddenValues" ) ) ) >>= aHiddenValues;
- if( !aHiddenValues.getLength() )
- return true;
- }
- catch( uno::Exception& )
- {
- return true;
- }
- }
- if( xDataSequence->getData().getLength() )
- return true;
- return false;
-}
-
-
sal_Int32 lcl_getChartType( const OUString& sChartType )
{
chart::TypeId eChartTypeId = chart::TYPEID_UNKNOWN;
@@ -1770,27 +1711,6 @@ void ChartExport::exportCandleStickSeries(
-void ChartExport::exportDataSeq( const Reference< chart2::data::XDataSequence > & xValueSeq, sal_Int32 elementTokenId )
-{
- FSHelperPtr pFS = GetFS();
- Reference< chart2::XChartDocument > xNewDoc( getModel(), uno::UNO_QUERY );
- pFS->startElement( FSNS( XML_c, elementTokenId ),
- FSEND );
-
- sal_Int32 eTokenId1 = elementTokenId == XML_val ? XML_numRef:XML_strRef;
- OUString aCellRange = lcl_ConvertRange( xValueSeq->getSourceRangeRepresentation(), xNewDoc );
- pFS->startElement( FSNS( XML_c, eTokenId1 ),
- FSEND );
-
- pFS->startElement( FSNS( XML_c, XML_f ),
- FSEND );
- pFS->writeEscaped( aCellRange );
- pFS->endElement( FSNS( XML_c, XML_f ) );
-
- pFS->endElement( FSNS( XML_c, eTokenId1 ) );
- pFS->endElement( FSNS( XML_c, elementTokenId ) );
-}
-
void ChartExport::exportSeriesText( const Reference< chart2::data::XDataSequence > & xValueSeq )
{
FSHelperPtr pFS = GetFS();
@@ -2126,113 +2046,6 @@ void ChartExport::exportAxis( AxisIdPair aAxisIdPair )
_exportAxis( xAxisProp, xAxisTitle, xMajorGrid, xMinorGrid, nAxisType, sAxPos, aAxisIdPair );
}
-void ChartExport::exportXAxis( AxisIdPair aAxisIdPair )
-{
- // get some properties from document first
- sal_Bool bHasXAxisTitle = sal_False,
- bHasSecondaryXAxisTitle = sal_False;
- sal_Bool bHasXAxisMajorGrid = sal_False,
- bHasXAxisMinorGrid = sal_False;
-
- Reference< XPropertySet > xDiagramProperties (mxDiagram, uno::UNO_QUERY);
-
- xDiagramProperties->getPropertyValue(
- OUString (RTL_CONSTASCII_USTRINGPARAM ("HasXAxisTitle"))) >>= bHasXAxisTitle;
- xDiagramProperties->getPropertyValue(
- OUString (RTL_CONSTASCII_USTRINGPARAM ("HasSecondaryXAxisTitle"))) >>= bHasSecondaryXAxisTitle;
-
- xDiagramProperties->getPropertyValue(
- OUString (RTL_CONSTASCII_USTRINGPARAM ("HasXAxisGrid"))) >>= bHasXAxisMajorGrid;
-
- xDiagramProperties->getPropertyValue(
- OUString (RTL_CONSTASCII_USTRINGPARAM ("HasXAxisHelpGrid"))) >>= bHasXAxisMinorGrid;
-
- // catAx
- Reference< ::com::sun::star::chart::XAxisXSupplier > xAxisXSupp( mxDiagram, uno::UNO_QUERY );
- if( !xAxisXSupp.is())
- return;
-
- Reference< XPropertySet > xAxisProp = xAxisXSupp->getXAxis();
- if( !xAxisProp.is() )
- return;
-
- sal_Int32 nAxisType = XML_catAx;
- sal_Int32 eChartType = getChartType( );
- if( (eChartType == chart::TYPEID_SCATTER)
- || (eChartType == chart::TYPEID_BUBBLE) )
- nAxisType = XML_valAx;
- else if( eChartType == chart::TYPEID_STOCK )
- nAxisType = XML_dateAx;
-
- Reference< drawing::XShape > xAxisTitle;
- if( bHasXAxisTitle )
- xAxisTitle.set( xAxisXSupp->getXAxisTitle(), uno::UNO_QUERY );
-
- // FIXME: axPos, need to check axis direction
- const char* sAxPos = "b";
- // major grid line
- Reference< beans::XPropertySet > xMajorGrid;
- if( bHasXAxisMajorGrid )
- xMajorGrid.set( xAxisXSupp->getXMainGrid(), uno::UNO_QUERY );
-
- // minor grid line
- Reference< beans::XPropertySet > xMinorGrid;
- if( bHasXAxisMinorGrid )
- xMinorGrid.set( xAxisXSupp->getXHelpGrid(), uno::UNO_QUERY );
-
- _exportAxis( xAxisProp, xAxisTitle, xMajorGrid, xMinorGrid, nAxisType, sAxPos, aAxisIdPair );
-}
-
-void ChartExport::exportYAxis( AxisIdPair aAxisIdPair )
-{
- // get some properties from document first
- sal_Bool bHasYAxisTitle = sal_False,
- bHasSecondaryYAxisTitle = sal_False;
- sal_Bool bHasYAxisMajorGrid = sal_False,
- bHasYAxisMinorGrid = sal_False;
-
- Reference< XPropertySet > xDiagramProperties (mxDiagram, uno::UNO_QUERY);
-
- xDiagramProperties->getPropertyValue(
- OUString (RTL_CONSTASCII_USTRINGPARAM ("HasYAxisTitle"))) >>= bHasYAxisTitle;
- xDiagramProperties->getPropertyValue(
- OUString (RTL_CONSTASCII_USTRINGPARAM ("HasSecondaryYAxisTitle"))) >>= bHasSecondaryYAxisTitle;
-
- xDiagramProperties->getPropertyValue(
- OUString (RTL_CONSTASCII_USTRINGPARAM ("HasYAxisGrid"))) >>= bHasYAxisMajorGrid;
- xDiagramProperties->getPropertyValue(
- OUString (RTL_CONSTASCII_USTRINGPARAM ("HasYAxisHelpGrid"))) >>= bHasYAxisMinorGrid;
-
- Reference< ::com::sun::star::chart::XAxisYSupplier > xAxisYSupp( mxDiagram, uno::UNO_QUERY );
- if( !xAxisYSupp.is())
- return;
-
- Reference< XPropertySet > xAxisProp = xAxisYSupp->getYAxis();
- if( !xAxisProp.is() )
- return;
-
- sal_Int32 nAxisType = XML_valAx;
-
- Reference< drawing::XShape > xAxisTitle;
- if( bHasYAxisTitle )
- xAxisTitle.set( xAxisYSupp->getYAxisTitle(), uno::UNO_QUERY );
-
- // FIXME: axPos
- const char* sAxPos = "l";
-
- // major grid line
- Reference< beans::XPropertySet > xMajorGrid;
- if( bHasYAxisMajorGrid )
- xMajorGrid.set( xAxisYSupp->getYMainGrid(), uno::UNO_QUERY );
-
- // minor grid line
- Reference< beans::XPropertySet > xMinorGrid;
- if( bHasYAxisMinorGrid )
- xMinorGrid.set( xAxisYSupp->getYHelpGrid(), uno::UNO_QUERY );
-
- _exportAxis( xAxisProp, xAxisTitle, xMajorGrid, xMinorGrid, nAxisType, sAxPos, aAxisIdPair );
-}
-
void ChartExport::_exportAxis(
const Reference< XPropertySet >& xAxisProp,
const Reference< drawing::XShape >& xAxisTitle,
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index b77318c..01e4c01 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -117,41 +117,6 @@ namespace drawingml {
#define GET(variable, propName) \
if ( GETA(propName) ) \
mAny >>= variable;
-DBG(
-void lcl_dump_pset(Reference< XPropertySet > rXPropSet)
-{
- Reference< XPropertySetInfo > info = rXPropSet->getPropertySetInfo ();
- Sequence< beans::Property > props = info->getProperties ();
-
- for (int i=0; i < props.getLength (); i++) {
- OString name = OUStringToOString( props [i].Name, RTL_TEXTENCODING_UTF8);
- fprintf (stderr,"%30s = ", name.getStr() );
-
- try {
- Any value = rXPropSet->getPropertyValue( props [i].Name );
-
- OUString strValue;
- sal_Int32 intValue;
- bool boolValue;
- LineSpacing spacing;
-
- if( value >>= strValue )
- fprintf (stderr,"\"%s\"\n", USS( strValue ) );
- else if( value >>= intValue )
- fprintf (stderr,"%" SAL_PRIdINT32 " (hex: %" SAL_PRIxUINT32 ")\n", intValue, intValue);
- else if( value >>= boolValue )
- fprintf (stderr,"%d (bool)\n", boolValue);
- else if( value >>= spacing ) {
- fprintf (stderr, "mode: %d value: %d\n", spacing.Mode, spacing.Height);
- }
- else
- fprintf (stderr,"??? <unhandled type>\n");
- } catch(const Exception &) {
- fprintf (stderr,"unable to get '%s' value\n", USS(props [i].Name));
- }
- }
-}
-);
// not thread safe
int DrawingML::mnImageCounter = 1;
diff --git a/unusedcode.easy b/unusedcode.easy
index 5c516ed..bf5cbbc 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -870,20 +870,6 @@ nullcanvas::SpriteCanvasHelper::opaqueUpdate(basegfx::B2DConnectedRanges<canvas:
nullcanvas::SpriteCanvasHelper::scrollUpdate(basegfx::B2DRange const&, basegfx::B2DRange const&, basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&)
ooo::vba::extractIntFromAny(com::sun::star::uno::Any const&)
oox::core::PowerPointExport::WriteTextStyleLevel(boost::shared_ptr<sax_fastparser::FastSerializerHelper>, int, int)
-oox::drawingml::ChartExport::exportDataSeq(com::sun::star::uno::Reference<com::sun::star::chart2::data::XDataSequence> const&, int)
-oox::drawingml::ChartExport::exportXAxis(oox::drawingml::AxisIdPair)
-oox::drawingml::ChartExport::exportYAxis(oox::drawingml::AxisIdPair)
-oox::drawingml::ColorPropertySet::getColor()
-oox::drawingml::ColorPropertySet::setColor(int)
-oox::drawingml::GraphicProperties::assignUsed(oox::drawingml::GraphicProperties const&)
-oox::drawingml::TextBodyProperties::pushToPropMap(oox::PropertyMap&) const
-oox::drawingml::TextListStyle::dump() const
-oox::drawingml::addMissingProperties(oox::PropertyMap const&, oox::PropertyMap&)
-oox::drawingml::chart::ObjectTypeFormatter::convertAutomaticLine(oox::PropertySet&, int)
-oox::drawingml::lcl_SequenceHasUnhiddenData(com::sun::star::uno::Reference<com::sun::star::chart2::data::XDataSequence> const&)
-oox::drawingml::lcl_dump_pset(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>)
-oox::drawingml::lcl_getSequenceLengthByRole(com::sun::star::uno::Sequence<com::sun::star::uno::Reference<com::sun::star::chart2::data::XLabeledDataSequence> > const&, rtl::OUString const&)
-oox::drawingml::lcl_getValueFromSequence(com::sun::star::uno::Reference<com::sun::star::chart2::data::XDataSequence> const&, int)
oox::dump::AxPropertyObjectBase::construct(oox::dump::OutputObjectBase const&, oox::dump::BinaryInputStreamRef const&, oox::dump::String const&, bool)
oox::dump::BinaryStreamObject::BinaryStreamObject(oox::dump::OutputObjectBase const&, oox::dump::BinaryInputStreamRef const&)
oox::dump::Config::requestEncryptionData(comphelper::IDocPasswordVerifier&)
commit 55a40209072bac2526e74d5be7dd7be5ccd2c175
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Mar 20 11:37:07 2012 +0000
remove ToDouble/ToFloat
diff --git a/basic/inc/basic/sbx.hxx b/basic/inc/basic/sbx.hxx
index b4db6e6..a652bec 100644
--- a/basic/inc/basic/sbx.hxx
+++ b/basic/inc/basic/sbx.hxx
@@ -44,7 +44,6 @@
#include <boost/ptr_container/ptr_vector.hpp>
class String;
-class UniString;
class SvStream;
class SbxBase;
class SbxVariable;
diff --git a/basic/inc/basic/sbxcore.hxx b/basic/inc/basic/sbxcore.hxx
index 1969adf..781c58e 100644
--- a/basic/inc/basic/sbxcore.hxx
+++ b/basic/inc/basic/sbxcore.hxx
@@ -38,7 +38,6 @@
class SvStream;
class String;
-class UniString;
namespace rtl { class OUString; }
// The following Macro defines four (five) necessary methods within a
diff --git a/basic/inc/basic/sbxfac.hxx b/basic/inc/basic/sbxfac.hxx
index 2ef93a1..3759ea8 100644
--- a/basic/inc/basic/sbxfac.hxx
+++ b/basic/inc/basic/sbxfac.hxx
@@ -35,7 +35,6 @@
class SbxBase;
class SbxObject;
class String;
-class UniString;
class BASIC_DLLPUBLIC SbxFactory
{
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index 74b9d9c..dcefac7 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -854,7 +854,7 @@ sal_Bool SbxValue::SetType( SbxDataType t )
sal_uInt16 nSlotId = pThisVar
? ( (sal_Int16) ( pThisVar->GetUserData() & 0xFFFF ) )
: 0;
- DBG_ASSERT( nSlotId != 5345 || pThisVar->GetName() == UniString::CreateFromAscii( "Parent" ),
+ DBG_ASSERT( nSlotId != 5345 || pThisVar->GetName().EqualsAscii("Parent"),
"SID_PARENTOBJECT heisst nicht 'Parent'" );
sal_Bool bParentProp = 5345 == nSlotId;
if ( !bParentProp )
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 9ea83da..5290c78 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -1592,11 +1592,11 @@ IMPL_LINK( SvtFileDialog, SelectHdl_Impl, SvTabListBox*, pBox )
else if ( !pUserData->mbIsFolder )
{
_pImp->_pEdFileName->SetText( pUserData->maURL );
- _pImp->_pEdFileName->SetSelection( Selection( 0, pUserData->maURL.Len() ) );
+ _pImp->_pEdFileName->SetSelection( Selection( 0, pUserData->maURL.getLength() ) );
_aPath = pUserData->maURL;
}
else
- _pImp->_pEdFileName->SetText( UniString() );
+ _pImp->_pEdFileName->SetText( rtl::OUString() );
}
else
{
@@ -2153,7 +2153,7 @@ short SvtFileDialog::PrepareExecute()
// if applicable set respectively create filter for all files
if ( !bHasAll )
{
- SvtFileDialogFilter_Impl* pAllFilter = implAddFilter( aAll, UniString(RTL_CONSTASCII_USTRINGPARAM(FILEDIALOG_FILTER_ALL)) );
+ SvtFileDialogFilter_Impl* pAllFilter = implAddFilter( aAll, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(FILEDIALOG_FILTER_ALL)) );
_pImp->InsertFilterListEntry( pAllFilter );
_pImp->SetCurFilter( pAllFilter, aAll );
}
diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index 45854c2..226e86c 100644
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@ -75,7 +75,7 @@ COMPILER_AND_FLAGS=$(CC)
COMPILER_AND_FLAGS+=-fvisibility=hidden
.ENDIF
-BUILD_ACTION=make build_libs CC='$(COMPILER_AND_FLAGS)'
+BUILD_ACTION=make build_libs CC='$(COMPILER_AND_FLAGS)' -j1
OUT2LIB = libssl.*
OUT2LIB += libcrypto.*
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index d182031..8e42e16 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -2104,9 +2104,9 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet )
break;
default:
{
- String aText( mpCBRepeat->GetText() );
- if( aText.Len() )
- aRepeatCount <<= aText.ToDouble();
+ rtl::OUString aText( mpCBRepeat->GetText() );
+ if( !aText.isEmpty() )
+ aRepeatCount <<= aText.toDouble();
}
}
@@ -2135,10 +2135,10 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet )
}
else
{
- String aText( mpCBDuration->GetText() );
- if( aText.Len() )
+ rtl::OUString aText( mpCBDuration->GetText() );
+ if( !aText.isEmpty() )
{
- fDuration = aText.ToDouble();
+ fDuration = aText.toDouble();
}
}
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 3b1f2a4..b386cf3 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -1972,8 +1972,8 @@ void SmParser::FontSize()
Fraction aValue( 1L );
if (lcl_IsNumber( m_aCurToken.aText ))
{
- double fTmp;
- if ((fTmp = m_aCurToken.aText.ToDouble()) != 0.0)
+ double fTmp = rtl::OUString(m_aCurToken.aText).toDouble();
+ if (fTmp != 0.0)
{
aValue = fTmp;
diff --git a/svtools/inc/svtools/filectrl.hxx b/svtools/inc/svtools/filectrl.hxx
index 14dcc75..e1c2b04 100644
--- a/svtools/inc/svtools/filectrl.hxx
+++ b/svtools/inc/svtools/filectrl.hxx
@@ -86,7 +86,7 @@ public:
void SetText( const XubString& rStr );
XubString GetText() const;
- UniString GetSelectedText() const { return maEdit.GetSelected(); }
+ rtl::OUString GetSelectedText() const { return maEdit.GetSelected(); }
void SetSelection( const Selection& rSelection ) { maEdit.SetSelection( rSelection ); }
Selection GetSelection() const { return maEdit.GetSelection(); }
@@ -95,10 +95,6 @@ public:
sal_Bool IsReadOnly() const { return maEdit.IsReadOnly(); }
//------
- //manipulate the Button-Text:
- XubString GetButtonText() const { return maButtonText; }
-
- //------
//use this to manipulate the dialog bevore executing it:
void SetDialogCreatedHdl( const Link& rLink ) { maDialogCreatedHdl = rLink; }
const Link& GetDialogCreatedHdl() const { return maDialogCreatedHdl; }
diff --git a/svtools/inc/svtools/filedlg.hxx b/svtools/inc/svtools/filedlg.hxx
index e774fa5..6fa7333 100644
--- a/svtools/inc/svtools/filedlg.hxx
+++ b/svtools/inc/svtools/filedlg.hxx
@@ -46,17 +46,14 @@ private:
ImpSvFileDlg* pImpFileDlg; // Implementation
Link aOKHdlLink; // Link to OK-Handler
-protected:
- UniString aDfltExt; // Default - Extension
-
public:
PathDialog( Window* pParent, WinBits nWinStyle = 0, sal_Bool bCreateDir = sal_True );
~PathDialog();
virtual long OK();
- void SetPath( const UniString& rNewPath );
- UniString GetPath() const;
+ void SetPath( const rtl::OUString& rNewPath );
+ rtl::OUString GetPath() const;
void SetOKHdl( const Link& rLink ) { aOKHdlLink = rLink; }
const Link& GetOKHdl() const { return aOKHdlLink; }
diff --git a/svtools/inc/svtools/fileview.hxx b/svtools/inc/svtools/fileview.hxx
index ec40c05..c5ec78e 100644
--- a/svtools/inc/svtools/fileview.hxx
+++ b/svtools/inc/svtools/fileview.hxx
@@ -215,9 +215,9 @@ protected:
struct SvtContentEntry
{
sal_Bool mbIsFolder;
- UniString maURL;
+ rtl::OUString maURL;
- SvtContentEntry( const UniString& rURL, sal_Bool bIsFolder ) :
+ SvtContentEntry( const rtl::OUString& rURL, sal_Bool bIsFolder ) :
mbIsFolder( bIsFolder ), maURL( rURL ) {}
};
diff --git a/svtools/source/dialogs/filedlg.cxx b/svtools/source/dialogs/filedlg.cxx
index a985eda..fb56769 100644
--- a/svtools/source/dialogs/filedlg.cxx
+++ b/svtools/source/dialogs/filedlg.cxx
@@ -49,12 +49,12 @@ short PathDialog::Execute()
return n;
}
-UniString PathDialog::GetPath() const
+rtl::OUString PathDialog::GetPath() const
{
return pImpFileDlg->GetDialog()->GetPath();
}
-void PathDialog::SetPath( const UniString& rPath )
+void PathDialog::SetPath( const rtl::OUString& rPath )
{
pImpFileDlg->GetDialog()->SetPath( rPath );
}
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 56e93da..b21bc0b 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -1171,18 +1171,17 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse)
pView->GetAttributes(aSet);
SfxItemSet aNewSet(*aSet.GetPool(),pEntry->nWhichId,pEntry->nWhichId);
- XubString aNewText(pBrowse->GetNewEntryValue());
- sal_Bool bDel( aNewText.EqualsAscii("del")
- || aNewText.EqualsAscii("Del")
- || aNewText.EqualsAscii("DEL")
- || aNewText.EqualsAscii("default")
- || aNewText.EqualsAscii("Default")
- || aNewText.EqualsAscii("DEFAULT"));
+ rtl::OUString aNewText(pBrowse->GetNewEntryValue());
+ sal_Bool bDel( aNewText == "del"
+ || aNewText == "Del"
+ || aNewText == "DEL"
+ || aNewText == "default"
+ || aNewText == "Default"
+ || aNewText == "DEFAULT" );
if (!bDel) {
SfxPoolItem* pNewItem=aSet.Get(pEntry->nWhichId).Clone();
- long nLongVal=0;
- nLongVal = aNewText.ToInt32();
+ long nLongVal = aNewText.toInt32();
if (pEntry->bCanNum) {
if (nLongVal>pEntry->nMax) nLongVal=pEntry->nMax;
if (nLongVal<pEntry->nMin) nLongVal=pEntry->nMin;
@@ -1190,18 +1189,18 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse)
bool bPairX = true;
bool bPairY = false;
sal_uInt16 nSepLen=1;
- long nLongX = aNewText.ToInt32();
+ long nLongX = aNewText.toInt32();
long nLongY=0;
- xub_StrLen nPos = aNewText.Search(sal_Unicode('/'));
- if (nPos==STRING_NOTFOUND) nPos=aNewText.Search(sal_Unicode(':'));
- if (nPos==STRING_NOTFOUND) nPos=aNewText.Search(sal_Unicode(' '));
- if (nPos==STRING_NOTFOUND) { nPos=aNewText.SearchAscii(".."); if (nPos!=STRING_NOTFOUND) nSepLen=2; }
- if (nPos!=STRING_NOTFOUND) {
+ sal_Int32 nPos = aNewText.indexOf(sal_Unicode('/'));
+ if (nPos==-1) nPos=aNewText.indexOf(sal_Unicode(':'));
+ if (nPos==-1) nPos=aNewText.indexOf(sal_Unicode(' '));
+ if (nPos==-1) { nPos=aNewText.indexOf(".."); if (nPos!=-1) nSepLen=2; }
+ if (nPos!=01)
+ {
bPairX=nPos>0;
- XubString s(aNewText);
- s.Erase(0,nPos+nSepLen);
- bPairY = (sal_Bool)aNewText.Len();
- nLongY = s.ToInt32();
+ rtl::OUString s(aNewText.copy(nPos+nSepLen));
+ bPairY = !aNewText.isEmpty();
+ nLongY = s.toInt32();
}
switch (pEntry->eItemType) {
case ITEM_BYTE : ((SfxByteItem *)pNewItem)->SetValue((sal_uInt8 )nLongVal); break;
@@ -1210,22 +1209,22 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse)
case ITEM_INT32: {
if(HAS_BASE(SdrAngleItem, pNewItem))
{
- aNewText.SearchAndReplace(sal_Unicode(','), sal_Unicode('.'));
- double nVal = aNewText.ToFloat();
+ aNewText = aNewText.replace(',', '.');
+ double nVal = aNewText.toFloat();
nLongVal = (long)(nVal * 100 + 0.5);
}
((SfxInt32Item *)pNewItem)->SetValue((sal_Int32)nLongVal);
} break;
- case ITEM_UINT32: ((SfxUInt32Item*)pNewItem)->SetValue(aNewText.ToInt32()); break;
+ case ITEM_UINT32: ((SfxUInt32Item*)pNewItem)->SetValue(aNewText.toInt32()); break;
case ITEM_ENUM : ((SfxEnumItemInterface*)pNewItem)->SetEnumValue((sal_uInt16)nLongVal); break;
case ITEM_BOOL: {
- aNewText.ToUpperAscii();
- if (aNewText.EqualsAscii("TRUE")) nLongVal=1;
- if (aNewText.EqualsAscii("JA")) nLongVal=1;
- if (aNewText.EqualsAscii("AN")) nLongVal=1;
- if (aNewText.EqualsAscii("EIN")) nLongVal=1;
- if (aNewText.EqualsAscii("ON")) nLongVal=1;
- if (aNewText.EqualsAscii("YES")) nLongVal=1;
+ aNewText = aNewText.toAsciiUpperCase();
+ if (aNewText == "TRUE") nLongVal=1;
+ if (aNewText == "JA") nLongVal=1;
+ if (aNewText == "AN") nLongVal=1;
+ if (aNewText == "EIN") nLongVal=1;
+ if (aNewText == "ON") nLongVal=1;
+ if (aNewText == "YES") nLongVal=1;
((SfxBoolItem*)pNewItem)->SetValue((sal_Bool)nLongVal);
} break;
case ITEM_FLAG : ((SfxFlagItem *)pNewItem)->SetValue((sal_uInt16)nLongVal); break;
@@ -1253,7 +1252,7 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse)
case ITEM_FONTHEIGHT: {
sal_uIntPtr nHgt=0;
sal_uInt16 nProp=100;
- if (aNewText.Search(sal_Unicode('%'))!=STRING_NOTFOUND) {
+ if (aNewText.indexOf(sal_Unicode('%')) != -1) {
nProp=(sal_uInt16)nLongVal;
} else {
nHgt=nLongVal;
@@ -1262,7 +1261,7 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse)
} break;
case ITEM_FONTWIDTH: {
sal_uInt16 nProp=100;
- if (aNewText.Search(sal_Unicode('%'))!=STRING_NOTFOUND) {
+ if (aNewText.indexOf(sal_Unicode('%')) != -1) {
nProp=(sal_uInt16)nLongVal;
}
((SvxCharScaleWidthItem*)pNewItem)->SetValue(nProp);
diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx
index feb6c18..67f519d 100644
--- a/sw/source/filter/html/parcss1.cxx
+++ b/sw/source/filter/html/parcss1.cxx
@@ -360,7 +360,7 @@ CSS1Token CSS1Parser::GetNextToken()
!IsEOF() );
aToken += String(sTmpBuffer.makeStringAndClear());
- nValue = aToken.ToDouble();
+ nValue = rtl::OUString(aToken).toDouble();
// White Space ueberlesen
while( ( ' ' == cNextCh ||
diff --git a/tools/inc/tools/config.hxx b/tools/inc/tools/config.hxx
index 478f765..59b813a 100644
--- a/tools/inc/tools/config.hxx
+++ b/tools/inc/tools/config.hxx
@@ -69,7 +69,7 @@ public:
sal_Bool HasGroup(const rtl::OString& rGroup) const;
rtl::OString ReadKey(const rtl::OString& rKey) const;
- UniString ReadKey(const rtl::OString& rKey, rtl_TextEncoding eEncoding) const;
+ rtl::OUString ReadKey(const rtl::OString& rKey, rtl_TextEncoding eEncoding) const;
rtl::OString ReadKey(const rtl::OString& rKey, const rtl::OString& rDefault) const;
void WriteKey(const rtl::OString& rKey, const rtl::OString& rValue);
void DeleteKey(const rtl::OString& rKey);
diff --git a/tools/inc/tools/inetmime.hxx b/tools/inc/tools/inetmime.hxx
index 6259c20..4c66c4d 100644
--- a/tools/inc/tools/inetmime.hxx
+++ b/tools/inc/tools/inetmime.hxx
@@ -514,7 +514,7 @@ public:
static void writeHeaderFieldBody(INetMIMEOutputSink & rSink,
HeaderFieldType eType,
- const UniString & rBody,
+ const rtl::OUString& rBody,
rtl_TextEncoding ePreferredEncoding,
bool bInitialSpace = true);
@@ -523,7 +523,7 @@ public:
rtl_TextEncoding eEncoding,
sal_uInt32 & rCharacter);
- static UniString decodeHeaderFieldBody(HeaderFieldType eType,
+ static rtl::OUString decodeHeaderFieldBody(HeaderFieldType eType,
const rtl::OString& rBody);
// #i70651#: Prevent warnings on Mac OS X.
@@ -1237,7 +1237,7 @@ struct INetContentTypeParameter
within Unicode's Private Use Area (effectively adding 0xF800 to the
character's numeric value).
*/
- const UniString m_sValue;
+ const rtl::OUString m_sValue;
/** This is true if the value is successfuly converted to Unicode, and
false if the value is a special mixture of ISO-LATIN-1 characters and
@@ -1247,7 +1247,7 @@ struct INetContentTypeParameter
INetContentTypeParameter(const rtl::OString& rTheAttribute,
const rtl::OString& rTheCharset, const rtl::OString& rTheLanguage,
- const UniString & rTheValue, bool bTheConverted)
+ const rtl::OUString& rTheValue, bool bTheConverted)
: m_sAttribute(rTheAttribute)
, m_sCharset(rTheCharset)
, m_sLanguage(rTheLanguage)
diff --git a/tools/inc/tools/rc.hxx b/tools/inc/tools/rc.hxx
index 1bca5f9..0ee95db 100644
--- a/tools/inc/tools/rc.hxx
+++ b/tools/inc/tools/rc.hxx
@@ -82,7 +82,7 @@ class TOOLS_DLLPUBLIC Resource
sal_Int16 ReadShortRes()
{ return m_pResMgr->ReadShort(); }
// read a string from resource data and increment pointer
- UniString ReadStringRes()
+ rtl::OUString ReadStringRes()
{ return m_pResMgr->ReadString(); }
// read a byte string from resource data and increment pointer
rtl::OString ReadByteStringRes()
diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index d4ba851..2d1e6a9 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.hxx
@@ -183,8 +183,6 @@ public:
static const UniString& EmptyString();
sal_Int32 ToInt32() const;
sal_Int64 ToInt64() const;
- float ToFloat() const;
- double ToDouble() const;
UniString& Assign( const UniString& rStr );
UniString& Assign( const rtl::OUString& rStr );
diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx
index dc0c08b..767e17a 100644
--- a/tools/source/generic/config.cxx
+++ b/tools/source/generic/config.cxx
@@ -888,7 +888,7 @@ rtl::OString Config::ReadKey(const rtl::OString& rKey) const
// -----------------------------------------------------------------------
-UniString Config::ReadKey(const rtl::OString& rKey, rtl_TextEncoding eEncoding) const
+rtl::OUString Config::ReadKey(const rtl::OString& rKey, rtl_TextEncoding eEncoding) const
{
if ( mpData->mbIsUTF8BOM )
eEncoding = RTL_TEXTENCODING_UTF8;
diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx
index a711e4a..531d5fc 100644
--- a/tools/source/inet/inetmime.cxx
+++ b/tools/source/inet/inetmime.cxx
@@ -1947,7 +1947,7 @@ void INetMIME::writeUTF8(INetMIMEOutputSink & rSink, sal_uInt32 nChar)
// static
void INetMIME::writeHeaderFieldBody(INetMIMEOutputSink & rSink,
HeaderFieldType eType,
- const UniString & rBody,
+ const rtl::OUString& rBody,
rtl_TextEncoding ePreferredEncoding,
bool bInitialSpace)
{
@@ -1959,7 +1959,7 @@ void INetMIME::writeHeaderFieldBody(INetMIMEOutputSink & rSink,
INetMIMEEncodedWordOutputSink::SPACE_ALWAYS :
INetMIMEEncodedWordOutputSink::SPACE_NO,
ePreferredEncoding);
- aOutput.write(rBody.GetBuffer(), rBody.GetBuffer() + rBody.Len());
+ aOutput.write(rBody.getStr(), rBody.getStr() + rBody.getLength());
aOutput.flush();
}
else
@@ -1967,8 +1967,8 @@ void INetMIME::writeHeaderFieldBody(INetMIMEOutputSink & rSink,
enum Brackets { BRACKETS_OUTSIDE, BRACKETS_OPENING, BRACKETS_INSIDE };
Brackets eBrackets = BRACKETS_OUTSIDE;
- const sal_Unicode * pBodyPtr = rBody.GetBuffer();
- const sal_Unicode * pBodyEnd = pBodyPtr + rBody.Len();
+ const sal_Unicode * pBodyPtr = rBody.getStr();
+ const sal_Unicode * pBodyEnd = pBodyPtr + rBody.getLength();
while (pBodyPtr != pBodyEnd)
switch (*pBodyPtr)
{
@@ -2757,7 +2757,7 @@ bool INetMIME::translateUTF8Char(const sal_Char *& rBegin,
//============================================================================
// static
-UniString INetMIME::decodeHeaderFieldBody(HeaderFieldType eType,
+rtl::OUString INetMIME::decodeHeaderFieldBody(HeaderFieldType eType,
const rtl::OString& rBody)
{
// Due to a bug in INetCoreRFC822MessageStream::ConvertTo7Bit(), old
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index 8e9931e..bc4e4ad 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -727,7 +727,7 @@ UniString GetTypeRes_Impl( const ResId& rTypeId )
{
// Funktion verlassen, falls Resourcefehler in dieser Funktion
static int bInUse = sal_False;
- UniString aTypStr( UniString::CreateFromInt32( rTypeId.GetId() ) );
+ rtl::OUString aTypStr(OUString::valueOf(static_cast<sal_Int32>(rTypeId.GetId())));
if ( !bInUse )
{
@@ -741,7 +741,7 @@ UniString GetTypeRes_Impl( const ResId& rTypeId )
rTypeId.SetRT( RSC_STRING );
if ( rTypeId.GetResMgr()->IsAvailable( rTypeId ) )
{
- aTypStr = UniString( rTypeId );
+ aTypStr = ResId::toString(rTypeId);
// Versions Resource Klassenzeiger ans Ende setzen
rTypeId.GetResMgr()->Increment( sizeof( RSHEADER_TYPE ) );
}
diff --git a/tools/source/string/tustring.cxx b/tools/source/string/tustring.cxx
index 53f5473..f3879e8 100644
--- a/tools/source/string/tustring.cxx
+++ b/tools/source/string/tustring.cxx
@@ -105,24 +105,6 @@ sal_Int64 UniString::ToInt64() const
// -----------------------------------------------------------------------
-float UniString::ToFloat() const
-{
- DBG_CHKTHIS( UniString, DbgCheckUniString );
-
- return rtl_ustr_toFloat( mpData->maStr );
-}
-
-// -----------------------------------------------------------------------
-
-double UniString::ToDouble() const
-{
- DBG_CHKTHIS( UniString, DbgCheckUniString );
-
- return rtl_ustr_toDouble( mpData->maStr );
-}
-
-// -----------------------------------------------------------------------
-
xub_StrLen STRING::SearchChar( const STRCODE* pChars, xub_StrLen nIndex ) const
{
DBG_CHKTHIS( STRING, DBGCHECKSTRING );
diff --git a/unusedcode.easy b/unusedcode.easy
index 112e3f7..5c516ed 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -563,8 +563,6 @@ binfilter::String::Search(unsigned short const*, unsigned short) const
binfilter::String::SearchAndReplaceAll(binfilter::String const&, binfilter::String const&)
binfilter::String::SearchAndReplaceAllAscii(char const*, binfilter::String const&)
binfilter::String::SearchChar(unsigned short const*, unsigned short) const
-binfilter::String::ToFloat() const
-binfilter::String::intern() const
binfilter::SvBools::Insert(binfilter::SvBools const*, unsigned short, unsigned short, unsigned short)
binfilter::SvBools::Replace(unsigned char const&, unsigned short)
binfilter::SvBools::Replace(unsigned char const*, unsigned short, unsigned short)
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index bcb676d..1a880eb 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -205,7 +205,7 @@ static sal_Bool ImplNumericGetValue( const XubString& rStr, double& rValue,
aStr += aStr2;
// Bereichsueberpruefung
- double nValue = aStr.ToDouble();
+ double nValue = rtl::OUString(aStr).toDouble();
if ( bRound )
{
if ( !bNegative )
commit a92129ec175a1362e61a474cf64992f283db74b4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Mar 20 01:07:37 2012 +0000
callcatcher: update list, I suspect SvLBoxBmp cannot be instantiated
diff --git a/svtools/inc/svtools/svlbitm.hxx b/svtools/inc/svtools/svlbitm.hxx
index 3b65182..8e1957b 100644
--- a/svtools/inc/svtools/svlbitm.hxx
+++ b/svtools/inc/svtools/svlbitm.hxx
@@ -145,7 +145,6 @@ public:
virtual ~SvLBoxBmp();
virtual sal_uInt16 IsA();
void InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* );
- void SetBitmap( SvLBoxEntry*, Image );
void Paint( const Point&, SvLBox& rView, sal_uInt16 nFlags,SvLBoxEntry* );
SvLBoxItem* Create() const;
void Clone( SvLBoxItem* pSource );
diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx
index 8a540f2..49310c2 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -296,12 +296,6 @@ sal_uInt16 SvLBoxBmp::IsA()
return SV_ITEM_ID_LBOXBMP;
}
-void SvLBoxBmp::SetBitmap( SvLBoxEntry*, Image aBitmap)
-{
- DBG_CHKTHIS(SvLBoxBmp,0);
- aBmp = aBitmap;
-}
-
void SvLBoxBmp::InitViewData( SvLBox* pView,SvLBoxEntry* pEntry,
SvViewDataItem* pViewData)
{
diff --git a/unusedcode.easy b/unusedcode.easy
index 43812d8..112e3f7 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -72,6 +72,8 @@ 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::size() const
+ScDPItemData::ScDPItemData(rtl::OUString const*)
+ScDPItemData::SetErrorString(rtl::OUString const&)
ScDPLabelData::ScDPLabelData(rtl::OUString const&, short, bool)
ScDocRowHeightUpdater::TabRanges::TabRanges()
ScHTMLColOffset::Insert(ScHTMLColOffset const*, unsigned short, unsigned short)
@@ -886,32 +888,64 @@ oox::drawingml::lcl_getSequenceLengthByRole(com::sun::star::uno::Sequence<com::s
oox::drawingml::lcl_getValueFromSequence(com::sun::star::uno::Reference<com::sun::star::chart2::data::XDataSequence> const&, int)
oox::dump::AxPropertyObjectBase::construct(oox::dump::OutputObjectBase const&, oox::dump::BinaryInputStreamRef const&, oox::dump::String const&, bool)
oox::dump::BinaryStreamObject::BinaryStreamObject(oox::dump::OutputObjectBase const&, oox::dump::BinaryInputStreamRef const&)
+oox::dump::Config::requestEncryptionData(comphelper::IDocPasswordVerifier&)
oox::dump::Config::setNameList(oox::dump::String const&, boost::shared_ptr<oox::dump::NameListBase> const&)
oox::dump::Config::setStringOption(oox::dump::String const&, oox::dump::String const&)
oox::dump::ConfigItemBase::readConfigLine(oox::TextInputStream&) const
oox::dump::DffStreamObject::construct(oox::dump::ObjectBase const&, oox::dump::BinaryInputStreamRef const&, rtl::OUString const&)
+oox::dump::DffStreamObject::construct(oox::dump::OutputObjectBase const&, oox::dump::BinaryInputStreamRef const&)
oox::dump::DffStreamObject::dumpDffColor(oox::dump::String const&)
+oox::dump::FormulaStack::FormulaStack()
+oox::dump::FormulaStack::getString(std::stack<rtl::OUString, std::__debug::deque<rtl::OUString, std::allocator<rtl::OUString> > > const&) const
+oox::dump::FormulaStack::pushBinaryOp(oox::dump::String const&)
+oox::dump::FormulaStack::pushFuncOp(oox::dump::String const&, rtl::OUString const&, unsigned char)
+oox::dump::FormulaStack::pushOperand(oox::dump::String const&)
+oox::dump::FormulaStack::pushUnaryOp(oox::dump::String const&, oox::dump::String const&)
+oox::dump::FormulaStack::replaceOnTop(rtl::OUString const&, rtl::OUString const&)
+oox::dump::InputObjectBase::dumpChar(oox::dump::String const&, unsigned short)
+oox::dump::InputObjectBase::dumpColorABGR(oox::dump::String const&)
+oox::dump::InputObjectBase::dumpRk(oox::dump::String const&)
oox::dump::ItemFormat::set(oox::dump::DataType, oox::dump::FormatType, rtl::OUString const&, rtl::OUString const&)
+oox::dump::ObjectBase::reconstructConfig(boost::shared_ptr<oox::dump::Config> const&)
+oox::dump::OleStorageObject::construct(oox::dump::ObjectBase const&)
oox::dump::Output::resetIndent()
+oox::dump::Output::startTable(int, int, int)
oox::dump::Output::writeAddress(oox::dump::Address const&)
oox::dump::Output::writeRange(oox::dump::Range const&)
oox::dump::Output::writeRangeList(std::__debug::vector<oox::dump::Range, std::allocator<oox::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::vector<oox::dump::Range, std::allocator<oox::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::StdHlinkObject::StdHlinkObject(oox::dump::InputObjectBase const&)
oox::dump::StorageIterator::getElementCount() const
+oox::dump::StringHelper::appendIndexedText(rtl::OUStringBuffer&, rtl::OUString const&, long)
+oox::dump::StringHelper::appendIndexedText(rtl::OUStringBuffer&, rtl::OUString const&, rtl::OUString const&)
+oox::dump::StringHelper::appendToken(rtl::OUStringBuffer&, long, unsigned short)
oox::dump::StringHelper::prependToken(rtl::OUStringBuffer&, long, unsigned short)
oox::dump::TextStreamObjectBase::construct(oox::dump::InputObjectBase const&, unsigned short)
oox::dump::XmlStreamObject::XmlStreamObject(oox::dump::OutputObjectBase const&, oox::dump::BinaryInputStreamRef const&)
-oox::dump::biff::BiffObjectBase::dumpRowRange(oox::dump::String const&, bool)
-oox::dump::biff::FormulaObject::dumpCellFormula(oox::dump::String const&, unsigned short)
oox::formulaimport::XmlStream::AttributeList::hasAttribute(int) const
oox::formulaimport::XmlStream::skipElement(int)
oox::ole::VbaSiteModel::isVisible() const
+oox::ole::WordVbaProjectFilter_createInstance(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)
+oox::ole::WordVbaProjectFilter_getSupportedServiceNames()
oox::ppt::PPTShape::findPlaceholder(int, int, std::__debug::vector<boost::shared_ptr<oox::drawingml::Shape>, std::allocator<boost::shared_ptr<oox::drawingml::Shape> > >&)
oox::xls::ApiTokenIterator::ApiTokenIterator(oox::xls::ApiTokenIterator const&, bool)
+oox::xls::BiffDetector_createInstance(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)
oox::xls::BiffDrawingBase::appendRawObject(boost::shared_ptr<oox::xls::BiffDrawingObjectBase> const&)
oox::xls::BiffDrawingBase::setSkipObj(unsigned short)
oox::xls::BiffDrawingObjectBase::importObjBiff8(oox::xls::WorksheetHelper const&, oox::xls::BiffInputStream&)
oox::xls::BiffHelper::calcCodePageFromTextEncoding(unsigned short)
oox::xls::BiffHelper::calcRkFromDouble(int&, double)
+oox::xls::BiffInputStream::resetRecord(bool, unsigned short)
oox::xls::BiffOutputStream::BiffOutputStream(oox::BinaryOutputStream&, unsigned short)
oox::xls::BiffOutputStream::endRecord()
oox::xls::BiffOutputStream::fill(unsigned char, int, unsigned long)
@@ -925,6 +959,11 @@ oox::xls::CellBlock::CellBlock(oox::xls::WorksheetHelper const&, oox::ValueRange
oox::xls::CellBlock::isBefore(oox::ValueRange const&) const
oox::xls::CellBlock::isExpandable(oox::ValueRange const&) const
oox::xls::CellBlock::startNextRow()
+oox::xls::ExcelBiffFilter_createInstance(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)
+oox::xls::ExcelBiffFilter_getSupportedServiceNames()
+oox::xls::ExcelVbaProjectFilter_createInstance(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)
+oox::xls::ExcelVbaProjectFilter_getSupportedServiceNames()
+oox::xls::OOXMLFormulaParser_createInstance(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)
psp::PrinterGfx::DrawBitmap(Rectangle const&, Rectangle const&, psp::PrinterBmp const&, psp::PrinterBmp const&)
psp::PrinterGfx::DrawMask(Rectangle const&, Rectangle const&, psp::PrinterBmp const&, psp::PrinterColor&)
psp::PrinterGfx::GetGlyphBoundRect(unsigned short, Rectangle&)
commit 83ed5d4421ce2d4c7827a41b6c599b5475a8d8eb
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Mar 19 21:11:12 2012 +0000
GetStringRes inline doesn't have a purpose anymore
diff --git a/tools/inc/tools/rc.hxx b/tools/inc/tools/rc.hxx
index a631019..1bca5f9 100644
--- a/tools/inc/tools/rc.hxx
+++ b/tools/inc/tools/rc.hxx
@@ -56,10 +56,6 @@ class TOOLS_DLLPUBLIC Resource
void* GetClassRes()
{ return m_pResMgr->GetClass(); }
- // read a string from the resource
- static sal_uInt32 GetStringRes( UniString& rStr, const sal_uInt8* pStr )
- { return ResMgr::GetString( rStr, pStr ); }
-
// increase the memory pointer gotten by GetClassRes()
void* IncrementRes( sal_uInt32 nBytes )
{ return m_pResMgr->Increment( nBytes ); }
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index 8c6358e..8e9931e 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -1349,7 +1349,7 @@ sal_uInt32 ResMgr::GetString( UniString& rStr, const sal_uInt8* pStr )
UniString aString;
sal_uInt32 nRet = GetStringWithoutHook( aString, pStr );
if ( pImplResHookProc )
- pImplResHookProc( aString );
+ aString = pImplResHookProc( aString );
rStr = aString;
return nRet;
}
@@ -1754,7 +1754,7 @@ UniString ResMgr::ReadString()
{
UniString aRet = ReadStringWithoutHook();
if ( pImplResHookProc )
- pImplResHookProc( aRet );
+ aRet = pImplResHookProc( aRet );
return aRet;
}
commit bdfba4dbf666868c6d10b972259884877dd01848
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Mar 19 20:31:38 2012 +0000
make ResId->OUString the primary route
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 5610637..01d1c7d 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -291,68 +291,70 @@ namespace
: public rtl::Static< String, WriterCompatibilityVersionOOo11 > {};
}
-void ReplaceStringHookProc( UniString& rStr )
+rtl::OUString ReplaceStringHookProc( const rtl::OUString& rStr )
{
- static int nAll = 0, nPro = 0;
+ rtl::OUString sRet(rStr);
- nAll++;
- if ( rStr.SearchAscii( "%PRODUCT" ) != STRING_NOTFOUND )
+ if ( sRet.indexOf( "%PRODUCT" ) != -1 )
{
- String rBrandName = BrandName::get();
- String rVersion = Version::get();
- String rAboutBoxVersion = AboutBoxVersion::get();
- String rAboutBoxVersionSuffix = AboutBoxVersionSuffix::get();
- String rExtension = Extension::get();
- String rXMLFileFormatName = XMLFileFormatName::get();
- String rXMLFileFormatVersion = XMLFileFormatVersion::get();
+ rtl::OUString sBrandName = BrandName::get();
+ rtl::OUString sVersion = Version::get();
+ rtl::OUString sAboutBoxVersion = AboutBoxVersion::get();
+ rtl::OUString sAboutBoxVersionSuffix = AboutBoxVersionSuffix::get();
+ rtl::OUString sExtension = Extension::get();
+ rtl::OUString sXMLFileFormatName = XMLFileFormatName::get();
+ rtl::OUString sXMLFileFormatVersion = XMLFileFormatVersion::get();
- if ( !rBrandName.Len() )
+ if ( sBrandName.isEmpty() )
{
- rBrandName = utl::ConfigManager::getProductName();
- rXMLFileFormatName = utl::ConfigManager::getProductXmlFileFormat();
- rXMLFileFormatVersion =
+ sBrandName = utl::ConfigManager::getProductName();
+ sXMLFileFormatName = utl::ConfigManager::getProductXmlFileFormat();
+ sXMLFileFormatVersion =
utl::ConfigManager::getProductXmlFileFormatVersion();
- rVersion = utl::ConfigManager::getProductVersion();
- rAboutBoxVersion = utl::ConfigManager::getAboutBoxProductVersion();
- rAboutBoxVersionSuffix = utl::ConfigManager::getAboutBoxProductVersionSuffix();
- if ( !rExtension.Len() )
+ sVersion = utl::ConfigManager::getProductVersion();
+ sAboutBoxVersion = utl::ConfigManager::getAboutBoxProductVersion();
+ sAboutBoxVersionSuffix = utl::ConfigManager::getAboutBoxProductVersionSuffix();
+ if ( sExtension.isEmpty() )
{
- rExtension = utl::ConfigManager::getProductExtension();
+ sExtension = utl::ConfigManager::getProductExtension();
}
}
- nPro++;
- rStr.SearchAndReplaceAllAscii( "%PRODUCTNAME", rBrandName );
- rStr.SearchAndReplaceAllAscii( "%PRODUCTVERSION", rVersion );
- rStr.SearchAndReplaceAllAscii( "%ABOUTBOXPRODUCTVERSIONSUFFIX", rAboutBoxVersionSuffix );
- rStr.SearchAndReplaceAllAscii( "%ABOUTBOXPRODUCTVERSION", rAboutBoxVersion );
- rStr.SearchAndReplaceAllAscii( "%PRODUCTEXTENSION", rExtension );
- rStr.SearchAndReplaceAllAscii( "%PRODUCTXMLFILEFORMATNAME", rXMLFileFormatName );
- rStr.SearchAndReplaceAllAscii( "%PRODUCTXMLFILEFORMATVERSION", rXMLFileFormatVersion );
+ sRet = sRet.replaceAll( "%PRODUCTNAME", sBrandName );
+ sRet = sRet.replaceAll( "%PRODUCTVERSION", sVersion );
+ sRet = sRet.replaceAll( "%ABOUTBOXPRODUCTVERSIONSUFFIX", sAboutBoxVersionSuffix );
+ sRet = sRet.replaceAll( "%ABOUTBOXPRODUCTVERSION", sAboutBoxVersion );
+ sRet = sRet.replaceAll( "%PRODUCTEXTENSION", sExtension );
+ sRet = sRet.replaceAll( "%PRODUCTXMLFILEFORMATNAME", sXMLFileFormatName );
+ sRet = sRet.replaceAll( "%PRODUCTXMLFILEFORMATVERSION", sXMLFileFormatVersion );
}
- if ( rStr.SearchAscii( "%OOOVENDOR" ) != STRING_NOTFOUND )
+
+ if ( sRet.indexOf( "%OOOVENDOR" ) != -1 )
{
- String rOOOVendor = OOOVendor::get();
+ rtl::OUString sOOOVendor = OOOVendor::get();
- if ( !rOOOVendor.Len() )
+ if ( sOOOVendor.isEmpty() )
{
- rOOOVendor = utl::ConfigManager::getVendor();
+ sOOOVendor = utl::ConfigManager::getVendor();
}
- rStr.SearchAndReplaceAllAscii( "%OOOVENDOR" ,rOOOVendor );
+
+ sRet = sRet.replaceAll( "%OOOVENDOR", sOOOVendor );
}
- if ( rStr.SearchAscii( "%WRITERCOMPATIBILITYVERSIONOOO11" ) != STRING_NOTFOUND )
+ if ( sRet.indexOf( "%WRITERCOMPATIBILITYVERSIONOOO11" ) != -1 )
{
- String rWriterCompatibilityVersionOOo11 = WriterCompatibilityVersionOOo11::get();
- if ( !rWriterCompatibilityVersionOOo11.Len() )
+ rtl::OUString sWriterCompatibilityVersionOOo11 = WriterCompatibilityVersionOOo11::get();
+ if ( sWriterCompatibilityVersionOOo11.isEmpty() )
{
- rWriterCompatibilityVersionOOo11 =
+ sWriterCompatibilityVersionOOo11 =
utl::ConfigManager::getWriterCompatibilityVersionOOo_1_1();
}
- rStr.SearchAndReplaceAllAscii( "%WRITERCOMPATIBILITYVERSIONOOO11",
- rWriterCompatibilityVersionOOo11 );
+ sRet = sRet.replaceAll( "%WRITERCOMPATIBILITYVERSIONOOO11",
+ sWriterCompatibilityVersionOOo11 );
}
+
+ return sRet;
}
static const char pLastSyncFileName[] = "lastsynchronized";
diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx
index 39f7278..d09b501 100644
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
@@ -53,14 +53,14 @@ namespace desktop
// __BOTTOM__
// [OK]
- const char *aCmdLineHelp_version =
+ const char aCmdLineHelp_version[] =
"%PRODUCTNAME %PRODUCTVERSION %PRODUCTEXTENSION\n"\
"\n";
- const char *aCmdLineHelp_head =
+ const char aCmdLineHelp_head[] =
"Usage: %CMDNAME [options] [documents...]\n"\
"\n"\
"Options:\n";
- const char *aCmdLineHelp_left =
+ const char aCmdLineHelp_left[] =
"--minimized \n"\
"--invisible \n"\
"--norestore \n"\
@@ -81,7 +81,7 @@ namespace desktop
"--web \n"\
"-o \n"\
"-n \n";
- const char *aCmdLineHelp_right =
+ const char aCmdLineHelp_right[] =
"keep startup bitmap minimized.\n"\
"no startup screen, no default document and no UI.\n"\
"suppress restart/restore after fatal errors.\n"\
@@ -102,7 +102,7 @@ namespace desktop
"create new HTML document.\n"\
"open documents regardless whether they are templates or not.\n"\
"always open documents as new files (use as template).\n";
- const char *aCmdLineHelp_bottom =
+ const char aCmdLineHelp_bottom[] =
"--display <display>\n"\
" Specify X-Display to use in Unix/X11 versions.\n"
"-p <documents...>\n"\
@@ -134,7 +134,7 @@ namespace desktop
" --print-to-file --printer-name nasty_lowres_printer --outdir /home/user *.doc\n"\
"\nRemaining arguments will be treated as filenames or URLs of documents to open.\n\n";
- void ReplaceStringHookProc( UniString& rStr );
+ rtl::OUString ReplaceStringHookProc(const rtl::OUString& rStr);
void displayCmdlineHelp()
{
@@ -145,7 +145,7 @@ namespace desktop
String aHelpMessage_left(aCmdLineHelp_left, RTL_TEXTENCODING_ASCII_US);
String aHelpMessage_right(aCmdLineHelp_right, RTL_TEXTENCODING_ASCII_US);
String aHelpMessage_bottom(aCmdLineHelp_bottom, RTL_TEXTENCODING_ASCII_US);
- ReplaceStringHookProc(aHelpMessage_version);
+ aHelpMessage_version = ReplaceStringHookProc(aHelpMessage_version);
aHelpMessage_head.SearchAndReplaceAscii( "%CMDNAME", String( "soffice", RTL_TEXTENCODING_ASCII_US) );
#ifdef UNX
// on unix use console for output
@@ -181,8 +181,8 @@ namespace desktop
void displayVersion()
{
- String aVersionMsg(aCmdLineHelp_version, RTL_TEXTENCODING_ASCII_US);
- ReplaceStringHookProc(aVersionMsg);
+ rtl::OUString aVersionMsg(aCmdLineHelp_version);
+ aVersionMsg = ReplaceStringHookProc(aVersionMsg);
#ifdef UNX
fprintf(stdout, "%s", rtl::OUStringToOString(aVersionMsg, RTL_TEXTENCODING_ASCII_US).getStr());
#else
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index c0ab460..d8d3150 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -100,41 +100,38 @@ namespace
: public rtl::Static< String, Extension > {};
}
-void ReplaceProductNameHookProc( String& rStr )
+rtl::OUString ReplaceProductNameHookProc( const rtl::OUString& rStr )
{
- static int nAll = 0, nPro = 0;
+ if (rStr.indexOf( "%PRODUCT" ) == -1)
+ return rStr;
- nAll++;
- if ( rStr.SearchAscii( "%PRODUCT" ) != STRING_NOTFOUND )
+ rtl::OUString sProductName = ProductName::get();
+ rtl::OUString sVersion = Version::get();
+ rtl::OUString sAboutBoxVersion = AboutBoxVersion::get();
+ rtl::OUString sAboutBoxVersionSuffix = AboutBoxVersionSuffix::get();
+ rtl::OUString sExtension = Extension::get();
+ rtl::OUString sOOOVendor = OOOVendor::get();
+
+ if ( sProductName.isEmpty() )
{
- String rProductName = ProductName::get();
- String rVersion = Version::get();
- String rAboutBoxVersion = AboutBoxVersion::get();
- String rAboutBoxVersionSuffix = AboutBoxVersionSuffix::get();
- String rExtension = Extension::get();
- String rOOOVendor = OOOVendor::get();
-
- if ( !rProductName.Len() )
+ sProductName = utl::ConfigManager::getProductName();
+ sVersion = utl::ConfigManager::getProductVersion();
+ sAboutBoxVersion = utl::ConfigManager::getAboutBoxProductVersion();
+ sAboutBoxVersionSuffix = utl::ConfigManager::getAboutBoxProductVersionSuffix();
+ sOOOVendor = utl::ConfigManager::getVendor();
+ if ( sExtension.isEmpty() )
{
- rProductName = utl::ConfigManager::getProductName();
- rVersion = utl::ConfigManager::getProductVersion();
- rAboutBoxVersion = utl::ConfigManager::getAboutBoxProductVersion();
- rAboutBoxVersionSuffix = utl::ConfigManager::getAboutBoxProductVersionSuffix();
- rOOOVendor = utl::ConfigManager::getVendor();
- if ( !rExtension.Len() )
- {
- rExtension = utl::ConfigManager::getProductExtension();
- }
+ sExtension = utl::ConfigManager::getProductExtension();
}
-
- nPro++;
- rStr.SearchAndReplaceAllAscii( "%PRODUCTNAME", rProductName );
- rStr.SearchAndReplaceAllAscii( "%PRODUCTVERSION", rVersion );
- rStr.SearchAndReplaceAllAscii( "%ABOUTBOXPRODUCTVERSIONSUFFIX", rAboutBoxVersionSuffix );
- rStr.SearchAndReplaceAllAscii( "%ABOUTBOXPRODUCTVERSION", rAboutBoxVersion );
- rStr.SearchAndReplaceAllAscii( "%OOOVENDOR", rOOOVendor );
- rStr.SearchAndReplaceAllAscii( "%PRODUCTEXTENSION", rExtension );
}
+
+ rtl::OUString sRet = rStr.replaceAll( "%PRODUCTNAME", sProductName );
+ sRet = sRet.replaceAll( "%PRODUCTVERSION", sVersion );
+ sRet = sRet.replaceAll( "%ABOUTBOXPRODUCTVERSIONSUFFIX", sAboutBoxVersionSuffix );
+ sRet = sRet.replaceAll( "%ABOUTBOXPRODUCTVERSION", sAboutBoxVersion );
+ sRet = sRet.replaceAll( "%OOOVENDOR", sOOOVendor );
+ sRet = sRet.replaceAll( "%PRODUCTEXTENSION", sExtension );
+ return sRet;
}
//==============================================================================
diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index 226e86c..45854c2 100644
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@ -75,7 +75,7 @@ COMPILER_AND_FLAGS=$(CC)
COMPILER_AND_FLAGS+=-fvisibility=hidden
.ENDIF
-BUILD_ACTION=make build_libs CC='$(COMPILER_AND_FLAGS)' -j1
+BUILD_ACTION=make build_libs CC='$(COMPILER_AND_FLAGS)'
OUT2LIB = libssl.*
OUT2LIB += libcrypto.*
diff --git a/padmin/source/pamain.cxx b/padmin/source/pamain.cxx
index e521c33..571d44d 100644
--- a/padmin/source/pamain.cxx
+++ b/padmin/source/pamain.cxx
@@ -60,15 +60,15 @@ public:
int Main();
virtual sal_uInt16 Exception( sal_uInt16 nError );
- static void ReadStringHook( String& );
+ static rtl::OUString ReadStringHook( const rtl::OUString& );
};
MyApp aMyApp;
-void MyApp::ReadStringHook( String& rStr )
+rtl::OUString MyApp::ReadStringHook( const rtl::OUString& rStr )
{
- rStr.SearchAndReplaceAllAscii(
- "%PRODUCTNAME", utl::ConfigManager::getProductName() );
+ return rStr.replaceAll(
+ rtl::OUString("%PRODUCTNAME"), utl::ConfigManager::getProductName() );
};
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 9b7c2a5..3b1f2a4 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -1914,11 +1914,11 @@ void SmParser::Font()
// gets number used as arguments in Math formulas (e.g. 'size' command)
// Format: no negative numbers, must start with a digit, no exponent notation, ...
-bool lcl_IsNumber(const UniString& rText)
+bool lcl_IsNumber(const rtl::OUString& rText)
{
bool bPoint = false;
- const sal_Unicode* pBuffer = rText.GetBuffer();
- for(xub_StrLen nPos = 0; nPos < rText.Len(); nPos++, pBuffer++)
+ const sal_Unicode* pBuffer = rText.getStr();
+ for(sal_Int32 nPos = 0; nPos < rText.getLength(); nPos++, pBuffer++)
{
const sal_Unicode cChar = *pBuffer;
if(cChar == '.')
diff --git a/svtools/inc/svtools/svlbitm.hxx b/svtools/inc/svtools/svlbitm.hxx
index 6ef90e9..3b65182 100644
--- a/svtools/inc/svtools/svlbitm.hxx
+++ b/svtools/inc/svtools/svlbitm.hxx
@@ -141,7 +141,6 @@ class SvLBoxBmp : public SvLBoxItem
{
Image aBmp;
public:
- SvLBoxBmp( SvLBoxEntry*, sal_uInt16 nFlags, Image );
SvLBoxBmp();
virtual ~SvLBoxBmp();
virtual sal_uInt16 IsA();
diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx
index 54241b5..8a540f2 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -280,13 +280,6 @@ void SvLBoxString::InitViewData( SvLBox* pView,SvLBoxEntry* pEntry,
DBG_NAME(SvLBoxBmp);
-SvLBoxBmp::SvLBoxBmp( SvLBoxEntry* pEntry, sal_uInt16 nFlags, Image aBitmap ) :
- SvLBoxItem( pEntry, nFlags )
-{
- DBG_CTOR(SvLBoxBmp,0);
- SetBitmap( pEntry, aBitmap);
-}
-
SvLBoxBmp::SvLBoxBmp() : SvLBoxItem()
{
DBG_CTOR(SvLBoxBmp,0);
diff --git a/tools/inc/tools/resid.hxx b/tools/inc/tools/resid.hxx
index 99d0bc4..2230556 100644
--- a/tools/inc/tools/resid.hxx
+++ b/tools/inc/tools/resid.hxx
@@ -164,7 +164,7 @@ class ResId
sal_uInt32 GetId() const { return m_nResId & ~RSC_DONTRELEASE; }
RSHEADER_TYPE* GetpResource() const { return m_pResource; }
- static TOOLS_DLLPUBLIC rtl::OUString toString(const ResId& aId);
+ static TOOLS_DLLPUBLIC rtl::OUString toString(const ResId& rId);
};
#endif // _RESID_HXX
diff --git a/tools/inc/tools/resmgr.hxx b/tools/inc/tools/resmgr.hxx
index dafbc35..bb81d0d 100644
--- a/tools/inc/tools/resmgr.hxx
+++ b/tools/inc/tools/resmgr.hxx
@@ -63,7 +63,7 @@ public:
// - ResMgr -
// ----------
-typedef void (*ResHookProc)( UniString& rStr );
+typedef rtl::OUString (*ResHookProc)( const rtl::OUString& rStr );
// ----------
// - ResMgr -
diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index 1077235..d4ba851 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.hxx
@@ -130,8 +130,6 @@ typedef struct _UniStringData
class TOOLS_DLLPUBLIC UniString
{
- TOOLS_DLLPRIVATE void InitStringRes( const sal_Char* pUTF8Str, sal_Int32 nLen );
-
private:
UniStringData* mpData;
diff --git a/tools/source/string/strucvt.cxx b/tools/source/string/strucvt.cxx
index 144d9e4..94884db 100644
--- a/tools/source/string/strucvt.cxx
+++ b/tools/source/string/strucvt.cxx
@@ -26,23 +26,6 @@
*
************************************************************************/
-
-// =======================================================================
-
-void UniString::InitStringRes( const char* pUTF8Str, sal_Int32 nLen )
-{
- DBG_CTOR( UniString, DbgCheckUniString );
- OSL_ENSURE(nLen <= STRING_MAXLEN, "Overflowing UniString");
-
- mpData = NULL;
- rtl_string2UString( (rtl_uString **)(&mpData),
- pUTF8Str, nLen,
- RTL_TEXTENCODING_UTF8,
- RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_MAPTOPRIVATE |
- RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_DEFAULT |
- RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT );
-}
-
// =======================================================================
UniString::UniString( const rtl::OString& rByteStr, rtl_TextEncoding eTextEncoding, sal_uInt32 nCvtFlags )
@@ -134,51 +117,71 @@ UniString& UniString::Assign( const rtl::OUString& rStr )
// =======================================================================
+#include <rtl/ustrbuf.hxx>
#include <tools/rc.hxx>
#include <tools/rcid.h>
UniString::UniString( const ResId& rResId )
+ : mpData(NULL)
{
- rResId.SetRT( RSC_STRING );
- ResMgr* pResMgr = rResId.GetResMgr();
- mpData = NULL;
- if ( pResMgr && pResMgr->GetResource( rResId ) )
- {
- // String laden
- RSHEADER_TYPE * pResHdr = (RSHEADER_TYPE*)pResMgr->GetClass();
- //sal_uInt32 nLen = pResHdr->GetLocalOff() - sizeof( RSHEADER_TYPE );
+ rtl::OUString sStr(ResId::toString(rResId));
- sal_Int32 nStringLen = rtl_str_getLength( (char*)(pResHdr+1) );
- InitStringRes( (const char*)(pResHdr+1), nStringLen );
+ DBG_CTOR( UniString, DbgCheckUniString );
+
+ OSL_ENSURE(sStr.pData->length < STRING_MAXLEN,
+ "Overflowing rtl::OUString -> UniString cut to zero length");
- sal_uInt32 nSize = sizeof( RSHEADER_TYPE )
- + sal::static_int_cast< sal_uInt32 >(nStringLen) + 1;
- nSize += nSize % 2;
- pResMgr->Increment( nSize );
+ if (sStr.pData->length < STRING_MAXLEN)
+ {
+ mpData = reinterpret_cast< UniStringData * >(sStr.pData);
+ STRING_ACQUIRE((STRING_TYPE *)mpData);
}
else
{
STRING_NEW((STRING_TYPE **)&mpData);
+ }
+
+
+}
+
+rtl::OUString ResId::toString(const ResId& rResId)
+{
+ rResId.SetRT( RSC_STRING );
+ ResMgr* pResMgr = rResId.GetResMgr();
+
+ if ( !pResMgr || !pResMgr->GetResource( rResId ) )
+ {
+ rtl::OUString sRet;
#if OSL_DEBUG_LEVEL > 0
- *this = UniString::CreateFromAscii( "<resource id " );
- Append( UniString::CreateFromInt32( rResId.GetId() ) );
- AppendAscii( " not found>" );
+ sRet = rtl::OUStringBuffer().
+ appendAscii(RTL_CONSTASCII_STRINGPARAM("<resource id ")).
+ append(static_cast<sal_Int32>(rResId.GetId())).
+ appendAscii(RTL_CONSTASCII_STRINGPARAM(" not found>")).
+ makeStringAndClear();
#endif
+
if( pResMgr )
pResMgr->PopContext();
+
+ return sRet;
}
+ // String loading
+ RSHEADER_TYPE * pResHdr = (RSHEADER_TYPE*)pResMgr->GetClass();
+
+ sal_Int32 nStringLen = rtl_str_getLength( (char*)(pResHdr+1) );
+ rtl::OUString sRet((const char*)(pResHdr+1), nStringLen, RTL_TEXTENCODING_UTF8);
+
+ sal_uInt32 nSize = sizeof( RSHEADER_TYPE )
+ + sal::static_int_cast< sal_uInt32 >(nStringLen) + 1;
+ nSize += nSize % 2;
+ pResMgr->Increment( nSize );
ResHookProc pImplResHookProc = ResMgr::GetReadStringHook();
if ( pImplResHookProc )
- pImplResHookProc( *this );
-}
-
-rtl::OUString ResId::toString(const ResId& aId)
-{
- // TODO: Optimize this.
- return rtl::OUString(UniString(aId));
+ sRet = pImplResHookProc(sRet);
+ return sRet;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unusedcode.easy b/unusedcode.easy
index 0baf9f2..43812d8 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -141,7 +141,6 @@ SrchAttrItemList::_ForEach(unsigned short, unsigned short, unsigned char (*)(Sea
StgCache::Pos2Page(int)
StgHeader::SetClassId(ClsId const&)
SvBorder::SvBorder(Rectangle const&, Rectangle const&)
-SvLBoxBmp::SvLBoxBmp(SvLBoxEntry*, unsigned short, Image)
SvLBoxButton::Check(SvLBox*, SvLBoxEntry*, unsigned char)
SvLBoxButtonData::SvLBoxButtonData()
SvLBoxEntryArr::DeleteAndDestroy(unsigned short, unsigned short)
commit 260ed4ed0317f4f16a675dde48750bc40923bc96
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Mar 19 11:52:27 2012 +0000
map of kind+name -> new-name
diff --git a/unusedcode.easy b/unusedcode.easy
index 35f8a9f..0baf9f2 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -141,11 +141,6 @@ SrchAttrItemList::_ForEach(unsigned short, unsigned short, unsigned char (*)(Sea
StgCache::Pos2Page(int)
StgHeader::SetClassId(ClsId const&)
SvBorder::SvBorder(Rectangle const&, Rectangle const&)
-SvI18NMap_Impl::Insert(SvI18NMapEntry_Impl* const&, unsigned short&)
-SvI18NMap_Impl::Insert(SvI18NMapEntry_Impl* const*, unsigned short)
-SvI18NMap_Impl::Insert(SvI18NMap_Impl const*, unsigned short, unsigned short)
-SvI18NMap_Impl::Remove(SvI18NMapEntry_Impl* const&, unsigned short)
-SvI18NMap_Impl::Remove(unsigned short, unsigned short)
SvLBoxBmp::SvLBoxBmp(SvLBoxEntry*, unsigned short, Image)
SvLBoxButton::Check(SvLBox*, SvLBoxEntry*, unsigned char)
SvLBoxButtonData::SvLBoxButtonData()
diff --git a/xmloff/inc/xmloff/i18nmap.hxx b/xmloff/inc/xmloff/i18nmap.hxx
index 2f56e26..2988e76 100644
--- a/xmloff/inc/xmloff/i18nmap.hxx
+++ b/xmloff/inc/xmloff/i18nmap.hxx
@@ -29,43 +29,54 @@
#ifndef _XMLOFF_I18NMAP_HXX
#define _XMLOFF_I18NMAP_HXX
-#include "sal/config.h"
+#include <sal/config.h>
#include "xmloff/dllapi.h"
-#include "sal/types.h"
+#include <rtl/ustring.hxx>
#include <tools/solar.h>
+#include <map>
-
-namespace rtl
+class SvI18NMapEntry_Key
{
- class OUString;
-}
+ sal_uInt16 nKind;
+ rtl::OUString aName;
+public:
+ SvI18NMapEntry_Key( sal_uInt16 nKnd, const rtl::OUString& rName ) :
+ nKind( nKnd ),
+ aName( rName )
+ {
+ }
+
+ sal_Bool operator==( const SvI18NMapEntry_Key& r ) const
+ {
+ return nKind == r.nKind &&
+ aName == r.aName;
+ }
+
+ sal_Bool operator<( const SvI18NMapEntry_Key& r ) const
+ {
+ return nKind < r.nKind ||
+ ( nKind == r.nKind &&
+ aName < r.aName);
+ }
+};
-class SvI18NMap_Impl;
-class SvI18NMapEntry_Impl;
+typedef std::map<SvI18NMapEntry_Key, rtl::OUString> SvI18NMap_Impl;
class XMLOFF_DLLPUBLIC SvI18NMap
{
- SvI18NMap_Impl *pImpl;
-
- SAL_DLLPRIVATE SvI18NMapEntry_Impl *_Find( sal_uInt16 nKind,
- const ::rtl::OUString& rName ) const;
+ SvI18NMap_Impl m_aMap;
public:
-
- SvI18NMap();
- ~SvI18NMap();
-
// Add a name mapping
- void Add( sal_uInt16 nKind, const ::rtl::OUString& rName,
- const ::rtl::OUString& rNewName );
+ bool Add( sal_uInt16 nKind, const rtl::OUString& rName,
+ const rtl::OUString& rNewName );
// Return a mapped name. If the name could not be found, return the
// original name.
- const ::rtl::OUString& Get( sal_uInt16 nKind,
- const ::rtl::OUString& rName ) const;
+ const rtl::OUString& Get( sal_uInt16 nKind,
+ const rtl::OUString& rName ) const;
};
-
#endif // _XMLOFF_I18NMAP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/i18nmap.cxx b/xmloff/source/core/i18nmap.cxx
index 0d5a970..ea4db31 100644
--- a/xmloff/source/core/i18nmap.cxx
+++ b/xmloff/source/core/i18nmap.cxx
@@ -31,96 +31,22 @@
#include <svl/svarray.hxx>
#include "xmloff/i18nmap.hxx"
-using ::rtl::OUString;
-
-class SvI18NMapEntry_Impl
-{
- sal_uInt16 nKind;
- OUString aName;
- OUString aNewName;
-
-public:
-
- const OUString& GetNewName() const { return aNewName; }
-
- SvI18NMapEntry_Impl( sal_uInt16 nKnd, const OUString& rName,
- const OUString& rNewName ) :
- nKind( nKnd ),
- aName( rName ),
- aNewName( rNewName )
- {}
-
- SvI18NMapEntry_Impl( sal_uInt16 nKnd, const OUString& rName ) :
- nKind( nKnd ),
- aName( rName )
- {}
-
- sal_Bool operator==( const SvI18NMapEntry_Impl& r ) const
- {
- return nKind == r.nKind &&
- aName == r.aName;
- }
-
- sal_Bool operator<( const SvI18NMapEntry_Impl& r ) const
- {
- return nKind < r.nKind ||
- ( nKind == r.nKind &&
- aName < r.aName);
- }
-};
-
-typedef SvI18NMapEntry_Impl *SvI18NMapEntry_ImplPtr;
-SV_DECL_PTRARR_SORT_DEL( SvI18NMap_Impl, SvI18NMapEntry_ImplPtr, 20 )
-SV_IMPL_OP_PTRARR_SORT( SvI18NMap_Impl, SvI18NMapEntry_ImplPtr )
-
-// ---------------------------------------------------------------------
-
-SvI18NMapEntry_Impl *SvI18NMap::_Find( sal_uInt16 nKind,
- const OUString& rName ) const
+bool SvI18NMap::Add( sal_uInt16 nKind, const rtl::OUString& rName,
+ const rtl::OUString& rNewName )
{
- SvI18NMapEntry_Impl *pRet = 0;
- SvI18NMapEntry_Impl aTst( nKind, rName );
-
- sal_uInt16 nPos;
- if( pImpl->Seek_Entry( &aTst, &nPos ) )
- {
- pRet = (*pImpl)[nPos];
- }
-
- return pRet;
-}
-
-SvI18NMap::SvI18NMap() :
- pImpl( 0 )
-{
- pImpl = new SvI18NMap_Impl;
+ SvI18NMapEntry_Key aKey(nKind, rName);
+ bool bIsNewInsertion = m_aMap.insert(SvI18NMap_Impl::value_type(aKey, rNewName)).second;
+ DBG_ASSERT( bIsNewInsertion, "SvI18NMap::Add: item registered already" );
+ return bIsNewInsertion;
}
-SvI18NMap::~SvI18NMap()
+const rtl::OUString& SvI18NMap::Get( sal_uInt16 nKind, const rtl::OUString& rName ) const
{
- delete pImpl;
+ SvI18NMapEntry_Key aKey(nKind, rName);
+ SvI18NMap_Impl::const_iterator aI = m_aMap.find(aKey);
+ if (aI != m_aMap.end())
+ return aI->second;
+ return rName;
}
-void SvI18NMap::Add( sal_uInt16 nKind, const OUString& rName,
- const OUString& rNewName )
-{
- SvI18NMapEntry_Impl *pEntry = _Find( nKind, rName );
- DBG_ASSERT( !pEntry, "SvI18NMap::Add: item registered already" );
- if( !pEntry )
- {
- pEntry = new SvI18NMapEntry_Impl( nKind, rName, rNewName );
- pImpl->Insert( pEntry );
- }
-}
-
-const OUString& SvI18NMap::Get( sal_uInt16 nKind, const OUString& rName ) const
-{
- SvI18NMapEntry_Impl *pEntry = _Find( nKind, rName );
- if( pEntry )
- return pEntry->GetNewName();
- else
- return rName;
-}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit a66ce1981ebb64edea067f8857df377486cafdba
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Mar 18 23:05:14 2012 +0000
sd.flt is archaic now
diff --git a/sd/util/sd.flt b/sd/util/sd.flt
deleted file mode 100644
index 215ef8e..0000000
--- a/sd/util/sd.flt
+++ /dev/null
@@ -1,135 +0,0 @@
-+getImplementation
-START
-CharAttribList
-CharPosArray
-ContentAttribs
-ContentAttribsInfo
-ContentInfo
-ContentNode
-DeletedNodeInfo
-EditAttrib
-EditCharAttrib
-EditDbg
-EditDoc
-EditEngineItemPool
-EditHTMLParser
-EditLine
-EditNodeIdx
-EditPaM
-EditPosition
-EditRTFParser
-EditSel
-EditSpellWrapper
-EditStyleSheet
-EditUndoConnectParas
-EditUndoDelContent
-EditUndoInsertChars
-EditUndoInsertFeature
-EditUndoManager
-EditUndoMoveParagraphs
-EditUndoRemoveChars
-EditUndoRemoveFeature
-EditUndoSetAttribs
-EditUndoSetParaAttribs
-EditUndoSetStyleSheet
-EditUndoSplitPara
-GlobalEditData
-IdleFormattter
-ImpEditEngine
-ImpEditView
-InternalEditStatus
-ParaPortion
-ParagraphList
-RTFPardAttrMapIds
-RTFPlainAttrMapIds
-SelRange
-SortedPositions_SAR
-SvxACorrChars
-SvxColorList
-SvxRTFStyleType
-SvxTabStopArr_SAR
-TextPortionList
-XEditAttrib
-XParaPortionList
-BinTextObject
-DialogsResMgr
-E3dDragMethod
-E3dTriangle
-GetImp
-ImpA
-ImpB
-ImpBrw
-ImpC
-ImpCheck
-ImpColor
-ImpD
-ImpDrag
-ImpEdCtrl
-ImpEdit
-ImpF
-+ImpGetResStr
-ImpGet
-ImpH
-ImpHide
-ImpI
-ImpItem
-ImpJ
-ImpL
-ImpList
-ImpM
-ImpMulti
-ImportInfo
-ImpP
-ImpPaint
-ImpPast
-ImpRecalc
-ImpReset
-ImpRemove
-ImpRef
-ImpReset
-ImpS
-ImpScroll
-ImpSdrGDIMetaFileImport
-ImpSet
-ImpShow
-ImpT
-ImpX
-OLUndoAttr
-OLUndoDepth
-OLUndoExpand
-OLUndoHeight
-OutlinerEditEng
-SdrGraphicLink
-SdrItemBrowser
-SdrOleLink
-SpellCache
-SvFileObject
-WrongList
-WrongRanges
-XIOCompat
-_SdrItemBrowserControl
-_SdrItemBrowserWindow
-+FmXGridControl
-+FmXGridPeer
-FmX
-FmExp
-ODatabaseForm
-WEP
-LIBMAIN
-LibMain
-??_5
-??_7
-??_8
-??_9
-??_C
-??_E
-??_F
-??_G
-??_H
-??_I
-___CT
-_alloc
-_CT
-exception::exception
-_TI2
-___CT
commit cf1e9315aae7c1c67f795aa9e4f0ea724303cd9a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Mar 18 23:03:00 2012 +0000
orientation is always vertical
diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx
index d7ebbad..da5dfc6 100644
--- a/sdext/source/presenter/PresenterScrollBar.cxx
+++ b/sdext/source/presenter/PresenterScrollBar.cxx
@@ -838,191 +838,6 @@ void PresenterVerticalScrollBar::PaintComposite(
GetBitmap(eArea, rpEndBitmaps));
}
-//===== PresenterHorizontalScrollBar ============================================
-
-PresenterHorizontalScrollBar::PresenterHorizontalScrollBar (
- const Reference<XComponentContext>& rxComponentContext,
- const Reference<awt::XWindow>& rxParentWindow,
- const ::boost::shared_ptr<PresenterPaintManager>& rpPaintManager,
- const ::boost::function<void(double)>& rThumbMotionListener)
- : PresenterScrollBar(rxComponentContext, rxParentWindow, rpPaintManager, rThumbMotionListener),
- mnScrollBarHeight(0)
-{
-}
-
-PresenterHorizontalScrollBar::~PresenterHorizontalScrollBar (void)
-{
-}
-
-double PresenterHorizontalScrollBar::GetDragDistance (const sal_Int32 nX, const sal_Int32 nY) const
-{
- (void)nY;
- const double nDistance (nX - maDragAnchor.X);
- if (nDistance == 0)
- return 0;
- else
- {
- const awt::Rectangle aWindowBox (mxWindow->getPosSize());
- const double nBarHeight (aWindowBox.Height);
- const double nPagerWidth (aWindowBox.Width - 2*nBarHeight);
- const double nDragDistance (mnTotalSize / nPagerWidth * nDistance);
- if (nDragDistance + mnThumbPosition < 0)
- return -mnThumbPosition;
- else if (mnThumbPosition + nDragDistance > mnTotalSize-mnThumbSize)
- return mnTotalSize-mnThumbSize-mnThumbPosition;
- else
- return nDragDistance;
- }
-}
-
-void PresenterHorizontalScrollBar::UpdateDragAnchor (const double nDragDistance)
-{
- const awt::Rectangle aWindowBox (mxWindow->getPosSize());
- const double nBarHeight (aWindowBox.Height);
- const double nPagerWidth (aWindowBox.Width - 2*nBarHeight);
- maDragAnchor.X += nDragDistance * nPagerWidth / mnTotalSize;
-}
-
-sal_Int32 PresenterHorizontalScrollBar::GetSize (void) const
-{
- return mnScrollBarHeight;
-}
-
-geometry::RealPoint2D PresenterHorizontalScrollBar::GetPoint (
- const double nMajor, const double nMinor) const
-{
- return geometry::RealPoint2D(nMajor, nMinor);
-}
-
-double PresenterHorizontalScrollBar::GetMajor (const double nX, const double nY) const
-{
- (void)nY;
- return nX;
-}
-
-double PresenterHorizontalScrollBar::GetMinor (const double nX, const double nY) const
-{
- (void)nX;
- return nY;
-}
-
-void PresenterHorizontalScrollBar::UpdateBorders (void)
-{
- const awt::Rectangle aWindowBox (mxWindow->getPosSize());
- double nRight = aWindowBox.Width;
- const double nGap (2);
-
- if (mpNextButtonDescriptor.get() != NULL)
- {
- Reference<rendering::XBitmap> xBitmap (mpNextButtonDescriptor->GetNormalBitmap());
- if (xBitmap.is())
- {
- geometry::IntegerSize2D aSize (xBitmap->getSize());
- maBox[NextButton] = geometry::RealRectangle2D(
- nRight - aSize.Width,0, nRight, aWindowBox.Height);
- nRight -= aSize.Width + nGap;
- }
- }
- if (mpPrevButtonDescriptor.get() != NULL)
- {
- Reference<rendering::XBitmap> xBitmap (mpPrevButtonDescriptor->GetNormalBitmap());
- if (xBitmap.is())
- {
- geometry::IntegerSize2D aSize (xBitmap->getSize());
- maBox[PrevButton] = geometry::RealRectangle2D(
- nRight - aSize.Width,0, nRight, aWindowBox.Height);
- nRight -= aSize.Width + nGap;
- }
- }
-
- const double nPagerWidth (nRight);
- maBox[Pager] = geometry::RealRectangle2D(
- 0,0, nRight, aWindowBox.Height);
- if (mnTotalSize == 0)
- {
- maBox[Thumb] = maBox[Pager];
-
- // Set up the enabled/disabled states.
- maEnabledState[PrevButton] = false;
- maEnabledState[PagerUp] = false;
- maEnabledState[NextButton] = false;
- maEnabledState[PagerDown] = false;
- maEnabledState[Thumb] = false;
- }
- else
- {
- const double nThumbSize = ::std::min(mnThumbSize,mnTotalSize);
- const double nThumbPosition = ::std::min(::std::max(0.0,mnThumbPosition), mnTotalSize - nThumbSize);
- maBox[Thumb] = geometry::RealRectangle2D(
- (nThumbPosition) / mnTotalSize * nPagerWidth, 0,
- (nThumbPosition+nThumbSize) / mnTotalSize * nPagerWidth, aWindowBox.Height);
-
- // Set up the enabled/disabled states.
- maEnabledState[PrevButton] = nThumbPosition>0;
- maEnabledState[PagerUp] = nThumbPosition>0;
- maEnabledState[NextButton] = nThumbPosition+nThumbSize < mnTotalSize;
- maEnabledState[PagerDown] = nThumbPosition+nThumbSize < mnTotalSize;
- maEnabledState[Thumb] = nThumbSize < mnTotalSize;
- }
- maBox[PagerUp] = geometry::RealRectangle2D(
- maBox[Pager].X1, maBox[Pager].Y1, maBox[Thumb].X1-1, maBox[Pager].Y2);
- maBox[PagerDown] = geometry::RealRectangle2D(
- maBox[Thumb].X2+1, maBox[Pager].Y1, maBox[Pager].X2, maBox[Pager].Y2);
- maBox[Total] = PresenterGeometryHelper::Union(
- PresenterGeometryHelper::Union(maBox[PrevButton], maBox[NextButton]),
- maBox[Pager]);
-}
-
-void PresenterHorizontalScrollBar::UpdateBitmaps (void)
-{
- if (mpBitmaps.get() != NULL)
- {
- mpPrevButtonDescriptor = mpBitmaps->GetBitmap(A2S("Left"));
- mpNextButtonDescriptor = mpBitmaps->GetBitmap(A2S("Right"));
- mpPagerStartDescriptor = mpBitmaps->GetBitmap(A2S("PagerLeft"));
- mpPagerCenterDescriptor = mpBitmaps->GetBitmap(A2S("PagerHorizontal"));
- mpPagerEndDescriptor = mpBitmaps->GetBitmap(A2S("PagerRight"));
- mpThumbStartDescriptor = mpBitmaps->GetBitmap(A2S("ThumbLeft"));
- mpThumbCenterDescriptor = mpBitmaps->GetBitmap(A2S("ThumbHorizontal"));
- mpThumbEndDescriptor = mpBitmaps->GetBitmap(A2S("ThumbRight"));
-
- mnScrollBarHeight = 0;
- UpdateWidthOrHeight(mnScrollBarHeight, mpPrevButtonDescriptor);
- UpdateWidthOrHeight(mnScrollBarHeight, mpNextButtonDescriptor);
- UpdateWidthOrHeight(mnScrollBarHeight, mpPagerStartDescriptor);
- UpdateWidthOrHeight(mnScrollBarHeight, mpPagerCenterDescriptor);
- UpdateWidthOrHeight(mnScrollBarHeight, mpPagerEndDescriptor);
- UpdateWidthOrHeight(mnScrollBarHeight, mpThumbStartDescriptor);
- UpdateWidthOrHeight(mnScrollBarHeight, mpThumbCenterDescriptor);
- UpdateWidthOrHeight(mnScrollBarHeight, mpThumbEndDescriptor);
- if (mnScrollBarHeight == 0)
- mnScrollBarHeight = 20;
- }
-}
-
-void PresenterHorizontalScrollBar::PaintComposite(
- const css::awt::Rectangle& rUpdateBox,
- const Area eArea,
- const SharedBitmapDescriptor& rpStartBitmaps,
- const SharedBitmapDescriptor& rpCenterBitmaps,
- const SharedBitmapDescriptor& rpEndBitmaps)
-{
- const awt::Rectangle aWindowBox (mxWindow->getPosSize());
- geometry::RealRectangle2D aBox (GetRectangle(eArea));
- aBox.X1 += aWindowBox.X;
- aBox.Y1 += aWindowBox.Y;
- aBox.X2 += aWindowBox.X;
- aBox.Y2 += aWindowBox.Y;
-
- PresenterUIPainter::PaintHorizontalBitmapComposite(
- mxCanvas,
- rUpdateBox,
- PresenterGeometryHelper::ConvertRectangle(aBox),
- GetBitmap(eArea, rpStartBitmaps),
- GetBitmap(eArea, rpCenterBitmaps),
- GetBitmap(eArea, rpEndBitmaps));
-}
-
//===== PresenterScrollBar::MousePressRepeater ================================
PresenterScrollBar::MousePressRepeater::MousePressRepeater (
diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sdext/source/presenter/PresenterScrollBar.hxx
index 2f21445..574bdaa 100644
--- a/sdext/source/presenter/PresenterScrollBar.hxx
+++ b/sdext/source/presenter/PresenterScrollBar.hxx
@@ -285,38 +285,6 @@ private:
sal_Int32 mnScrollBarWidth;
};
-/** A horizontal scroll bar.
-*/
-class PresenterHorizontalScrollBar : public PresenterScrollBar
-{
-public:
- PresenterHorizontalScrollBar (
- const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext,
- const css::uno::Reference<css::awt::XWindow>& rxParentWindow,
- const ::boost::shared_ptr<PresenterPaintManager>& rpPaintManager,
- const ::boost::function<void(double)>& rThumbMotionListener);
- virtual ~PresenterHorizontalScrollBar (void);
- virtual sal_Int32 GetSize (void) const;
-
-protected:
- virtual double GetDragDistance (const sal_Int32 nX, const sal_Int32 nY) const;
- virtual void UpdateDragAnchor (const double nDragDistance);
- virtual css::geometry::RealPoint2D GetPoint (const double nMajor, const double nMinor) const;
- virtual double GetMinor (const double nX, const double nY) const;
- virtual double GetMajor (const double nX, const double nY) const;
- virtual void UpdateBorders (void);
- virtual void UpdateBitmaps (void);
- virtual void PaintComposite(
- const css::awt::Rectangle& rRepaintBox,
- const Area eArea,
- const SharedBitmapDescriptor& rpStartBitmaps,
- const SharedBitmapDescriptor& rpCenterBitmaps,
- const SharedBitmapDescriptor& rpEndBitmaps);
-
-private:
- sal_Int32 mnScrollBarHeight;
-};
-
} } // end of namespace ::sdext::presenter
#endif
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx
index 30e19e6..4c466cb 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -94,11 +94,7 @@ namespace {
class PresenterSlideSorter::Layout
{
public:
- enum Orientation { Horizontal, Vertical };
- Layout (
- const Orientation eOrientation,
- const ::rtl::Reference<PresenterScrollBar>& rpHorizontalScrollBar,
- const ::rtl::Reference<PresenterScrollBar>& rpVerticalScrollBar);
+ Layout (const ::rtl::Reference<PresenterScrollBar>& rpVerticalScrollBar);
void Update (const geometry::RealRectangle2D& rBoundingBox, const double nSlideAspectRatio);
void SetupVisibleArea (void);
@@ -121,7 +117,6 @@ public:
sal_Int32 GetLastVisibleSlideIndex (void) const;
bool SetHorizontalOffset (const double nOffset);
bool SetVerticalOffset (const double nOffset);
- Orientation GetOrientation (void) const;
css::geometry::RealRectangle2D maBoundingBox;
css::geometry::IntegerSize2D maPreviewSize;
@@ -141,8 +136,6 @@ public:
sal_Int32 mnLastVisibleRow;
private:
- Orientation meOrientation;
- ::rtl::Reference<PresenterScrollBar> mpHorizontalScrollBar;
::rtl::Reference<PresenterScrollBar> mpVerticalScrollBar;
sal_Int32 GetIndex (const sal_Int32 nRow, const sal_Int32 nColumn) const;
@@ -272,7 +265,6 @@ PresenterSlideSorter::PresenterSlideSorter (
mbIsPaintPending(true),
mbIsLayoutPending(true),
mpLayout(),
- mpHorizontalScrollBar(),
mpVerticalScrollBar(),
mpCloseButton(),
mpMouseOverManager(),
@@ -318,24 +310,14 @@ PresenterSlideSorter::PresenterSlideSorter (
// Remember the current slide.
mnCurrentSlideIndex = mxSlideShowController->getCurrentSlideIndex();
- // Set the orientation.
- const bool bIsVertical (true);
-
// Create the scroll bar.
- if (bIsVertical)
- mpVerticalScrollBar = ::rtl::Reference<PresenterScrollBar>(
- new PresenterVerticalScrollBar(
- rxContext,
- mxWindow,
- mpPresenterController->GetPaintManager(),
- ::boost::bind(&PresenterSlideSorter::SetVerticalOffset,this,_1)));
- else
- mpHorizontalScrollBar = ::rtl::Reference<PresenterScrollBar>(
- new PresenterHorizontalScrollBar(
- rxContext,
- mxWindow,
- mpPresenterController->GetPaintManager(),
- ::boost::bind(&PresenterSlideSorter::SetHorizontalOffset,this,_1)));
+ mpVerticalScrollBar = ::rtl::Reference<PresenterScrollBar>(
+ new PresenterVerticalScrollBar(
+ rxContext,
+ mxWindow,
+ mpPresenterController->GetPaintManager(),
+ ::boost::bind(&PresenterSlideSorter::SetVerticalOffset,this,_1)));
+
mpCloseButton = PresenterButton::Create(
rxContext,
mpPresenterController,
@@ -353,10 +335,7 @@ PresenterSlideSorter::PresenterSlideSorter (
}
// Create the layout.
- mpLayout.reset(new Layout(
- Layout::Vertical,
- mpHorizontalScrollBar,
- mpVerticalScrollBar));
+ mpLayout.reset(new Layout(mpVerticalScrollBar));
// Create the preview cache.
mxPreviewCache = Reference<drawing::XSlidePreviewCache>(
@@ -415,14 +394,6 @@ void SAL_CALL PresenterSlideSorter::disposing (void)
if (xComponent.is())
xComponent->dispose();
}
- if (mpHorizontalScrollBar.is())
- {
- Reference<lang::XComponent> xComponent (
- static_cast<XWeak*>(mpHorizontalScrollBar.get()), UNO_QUERY);
- mpHorizontalScrollBar = NULL;
- if (xComponent.is())
- xComponent->dispose();
- }
if (mpCloseButton.is())
{
Reference<lang::XComponent> xComponent (
@@ -486,8 +457,6 @@ void SAL_CALL PresenterSlideSorter::disposing (const lang::EventObject& rEventOb
else if (rEventObject.Source == mxCanvas)
{
mxCanvas = NULL;
- if (mpHorizontalScrollBar.is())
- mpHorizontalScrollBar->SetCanvas(NULL);
mbIsLayoutPending = true;
mbIsPaintPending = true;
@@ -778,57 +747,28 @@ geometry::RealRectangle2D PresenterSlideSorter::PlaceScrollBars (
if (xSlides.is())
bIsScrollBarNeeded = mpLayout->IsScrollBarNeeded(xSlides->getCount());
- if (mpLayout->GetOrientation() == Layout::Vertical)
- {
- if (mpVerticalScrollBar.get() != NULL)
- {
- if (bIsScrollBarNeeded)
- {
- // Place vertical scroll bar at right border.
- mpVerticalScrollBar->SetPosSize(geometry::RealRectangle2D(
- rUpperBox.X2 - mpVerticalScrollBar->GetSize(),
- rUpperBox.Y1,
- rUpperBox.X2,
- rUpperBox.Y2));
- mpVerticalScrollBar->SetVisible(true);
-
- // Reduce area covered by the scroll bar from the available
- // space.
- return geometry::RealRectangle2D(
- rUpperBox.X1,
- rUpperBox.Y1,
- rUpperBox.X2 - mpVerticalScrollBar->GetSize() - gnHorizontalGap,
- rUpperBox.Y2);
- }
- else
- mpVerticalScrollBar->SetVisible(false);
- }
- }
- else
+ if (mpVerticalScrollBar.get() != NULL)
{
- if (mpHorizontalScrollBar.get() != NULL)
+ if (bIsScrollBarNeeded)
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list