summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
Diffstat (limited to 'svx')
-rw-r--r--svx/source/accessibility/AccessibleShape.cxx72
-rw-r--r--svx/source/dialog/dlgctrl.cxx22
-rw-r--r--svx/source/dialog/docrecovery.cxx18
-rw-r--r--svx/source/sidebar/area/AreaPropertyPanelBase.cxx18
-rw-r--r--svx/source/table/accessiblecell.cxx6
-rw-r--r--svx/source/table/tablerow.cxx2
-rw-r--r--svx/source/table/tablerow.hxx2
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx13
-rw-r--r--svx/source/xml/xmlgrhlp.cxx8
9 files changed, 58 insertions, 103 deletions
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index f38852e6be16..59c2ac597160 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -58,7 +58,7 @@
#include <algorithm>
#include <memory>
#include <utility>
-
+#include <o3tl/make_unique.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
using ::com::sun::star::uno::Reference;
@@ -194,8 +194,6 @@ void AccessibleShape::Init()
}
-
-
void AccessibleShape::UpdateStates()
{
::utl::AccessibleStateSetHelper* pStateSet =
@@ -279,8 +277,6 @@ bool AccessibleShape::SetState (sal_Int16 aState)
}
-
-
bool AccessibleShape::ResetState (sal_Int16 aState)
{
bool bStateHasChanged = false;
@@ -300,8 +296,6 @@ bool AccessibleShape::ResetState (sal_Int16 aState)
}
-
-
bool AccessibleShape::GetState (sal_Int16 aState)
{
if (aState == AccessibleStateType::FOCUSED && mpText != nullptr)
@@ -357,8 +351,6 @@ sal_Int32 SAL_CALL
}
-
-
/** Forward the request to the shape. Return the requested shape or throw
an exception for a wrong index.
*/
@@ -441,11 +433,11 @@ uno::Reference<XAccessibleStateSet> SAL_CALL
css::uno::Reference<XAccessibleStateSet> rState =
xTempAccContext->getAccessibleStateSet();
if( rState.is() ) {
- css::uno::Sequence<short> pStates = rState->getStates();
- int count = pStates.getLength();
+ css::uno::Sequence<short> aStates = rState->getStates();
+ int count = aStates.getLength();
for( int iIndex = 0;iIndex < count;iIndex++ )
{
- if( pStates[iIndex] == AccessibleStateType::EDITABLE )
+ if( aStates[iIndex] == AccessibleStateType::EDITABLE )
{
pStateSet->AddState (AccessibleStateType::EDITABLE);
pStateSet->AddState (AccessibleStateType::RESIZABLE);
@@ -484,11 +476,11 @@ uno::Reference<XAccessibleStateSet> SAL_CALL
css::uno::Reference<XAccessibleStateSet> rState =
xTempAccContext->getAccessibleStateSet();
if( rState.is() ) {
- css::uno::Sequence<short> pStates = rState->getStates();
- int count = pStates.getLength();
+ css::uno::Sequence<short> aStates = rState->getStates();
+ int count = aStates.getLength();
for( int iIndex = 0;iIndex < count;iIndex++ )
{
- if( pStates[iIndex] == AccessibleStateType::EDITABLE )
+ if( aStates[iIndex] == AccessibleStateType::EDITABLE )
{
pStateSet->AddState (AccessibleStateType::EDITABLE);
pStateSet->AddState (AccessibleStateType::RESIZABLE);
@@ -550,8 +542,6 @@ uno::Reference<XAccessible > SAL_CALL
}
-
-
awt::Rectangle SAL_CALL AccessibleShape::getBounds()
throw (css::uno::RuntimeException, std::exception)
{
@@ -665,8 +655,6 @@ awt::Rectangle SAL_CALL AccessibleShape::getBounds()
}
-
-
awt::Point SAL_CALL AccessibleShape::getLocation()
throw (css::uno::RuntimeException, std::exception)
{
@@ -676,8 +664,6 @@ awt::Point SAL_CALL AccessibleShape::getLocation()
}
-
-
awt::Point SAL_CALL AccessibleShape::getLocationOnScreen()
throw (css::uno::RuntimeException, std::exception)
{
@@ -701,8 +687,6 @@ awt::Point SAL_CALL AccessibleShape::getLocationOnScreen()
}
-
-
awt::Size SAL_CALL AccessibleShape::getSize()
throw (uno::RuntimeException, std::exception)
{
@@ -712,8 +696,6 @@ awt::Size SAL_CALL AccessibleShape::getSize()
}
-
-
sal_Int32 SAL_CALL AccessibleShape::getForeground()
throw (css::uno::RuntimeException, std::exception)
{
@@ -738,8 +720,6 @@ sal_Int32 SAL_CALL AccessibleShape::getForeground()
}
-
-
sal_Int32 SAL_CALL AccessibleShape::getBackground()
throw (css::uno::RuntimeException, std::exception)
{
@@ -797,8 +777,6 @@ void SAL_CALL AccessibleShape::addAccessibleEventListener (
}
-
-
void SAL_CALL AccessibleShape::removeAccessibleEventListener (
const Reference<XAccessibleEventListener >& rxListener)
throw (uno::RuntimeException, std::exception)
@@ -830,8 +808,6 @@ css::uno::Any SAL_CALL
}
-
-
void SAL_CALL
AccessibleShape::acquire()
throw ()
@@ -840,8 +816,6 @@ void SAL_CALL
}
-
-
void SAL_CALL
AccessibleShape::release()
throw ()
@@ -875,27 +849,27 @@ throw ( IndexOutOfBoundsException,
xText(xAcc, uno::UNO_QUERY);
if( xText.is() )
{
- if( xText->getSelectionStart() >= 0 ) return sal_True;
+ if( xText->getSelectionStart() >= 0 ) return true;
}
}
else if( xContext->getAccessibleRole() == AccessibleRole::SHAPE )
{
Reference< XAccessibleStateSet > pRState = xContext->getAccessibleStateSet();
if( !pRState.is() )
- return sal_False;
+ return false;
- uno::Sequence<short> pStates = pRState->getStates();
- int nCount = pStates.getLength();
+ uno::Sequence<short> aStates = pRState->getStates();
+ int nCount = aStates.getLength();
for( int i = 0; i < nCount; i++ )
{
- if(pStates[i] == AccessibleStateType::SELECTED)
- return sal_True;
+ if(aStates[i] == AccessibleStateType::SELECTED)
+ return true;
}
- return sal_False;
+ return false;
}
}
- return sal_False;
+ return false;
}
@@ -972,8 +946,6 @@ OUString SAL_CALL
}
-
-
uno::Sequence<OUString> SAL_CALL
AccessibleShape::getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception)
@@ -1260,11 +1232,6 @@ OUString
}
-
-
-
-
-
// protected
void AccessibleShape::disposing()
{
@@ -1324,8 +1291,6 @@ sal_Int32 SAL_CALL
}
-
-
void AccessibleShape::UpdateNameAndDescription()
{
// Ignore missing title, name, or description. There are fallbacks for
@@ -1488,10 +1453,9 @@ throw (uno::RuntimeException, std::exception)
std::sort( vXShapes.begin(), vXShapes.end(), XShapePosCompareHelper() );
//get the index of the selected object in the group
- std::vector< uno::Reference<drawing::XShape> >::iterator aIter;
//we start counting position from 1
sal_Int32 nPos = 1;
- for ( aIter = vXShapes.begin(); aIter != vXShapes.end(); ++aIter, nPos++ )
+ for ( std::vector< uno::Reference<drawing::XShape> >::const_iterator aIter = vXShapes.begin(); aIter != vXShapes.end(); ++aIter, nPos++ )
{
if ( (*aIter).get() == mxShape.get() )
{
@@ -1583,7 +1547,7 @@ sal_Int32 SAL_CALL AccessibleShape::getIndexAtPoint( const css::awt::Point& ) th
OUString SAL_CALL AccessibleShape::getSelectedText( ) throw (css::uno::RuntimeException, std::exception){return OUString();}
sal_Int32 SAL_CALL AccessibleShape::getSelectionStart( ) throw (css::uno::RuntimeException, std::exception){return 0;}
sal_Int32 SAL_CALL AccessibleShape::getSelectionEnd( ) throw (css::uno::RuntimeException, std::exception){return 0;}
-sal_Bool SAL_CALL AccessibleShape::setSelection( sal_Int32, sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return sal_True;}
+sal_Bool SAL_CALL AccessibleShape::setSelection( sal_Int32, sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return true;}
OUString SAL_CALL AccessibleShape::getText( ) throw (css::uno::RuntimeException, std::exception){return OUString();}
OUString SAL_CALL AccessibleShape::getTextRange( sal_Int32, sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return OUString();}
css::accessibility::TextSegment SAL_CALL AccessibleShape::getTextAtIndex( sal_Int32, sal_Int16 ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
@@ -1601,7 +1565,7 @@ css::accessibility::TextSegment SAL_CALL AccessibleShape::getTextBehindIndex( sa
css::accessibility::TextSegment aResult;
return aResult;
}
-sal_Bool SAL_CALL AccessibleShape::copyText( sal_Int32, sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return sal_True;}
+sal_Bool SAL_CALL AccessibleShape::copyText( sal_Int32, sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return true;}
} // end of namespace accessibility
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index d1b9a485f61a..f945a9933b17 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -123,7 +123,6 @@ void SvxRectCtl::Resize()
}
-
void SvxRectCtl::Resize_Impl()
{
aSize = GetOutputSize();
@@ -367,7 +366,6 @@ void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt )
}
-
void SvxRectCtl::StateChanged( StateChangedType nType )
{
if ( nType == StateChangedType::ControlForeground )
@@ -379,7 +377,6 @@ void SvxRectCtl::StateChanged( StateChangedType nType )
}
-
void SvxRectCtl::DataChanged( const DataChangedEvent& rDCEvt )
{
if ( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) && ( rDCEvt.GetFlags() & AllSettingsFlags::STYLE ) )
@@ -970,11 +967,11 @@ void SvxPixelCtl::KeyInput( const KeyEvent& rKEvt )
if( !bIsMod )
{
- Point pRepaintPoint( aRectSize.Width() *( aFocusPosition.getX() - 1)/ nLines - 1,
+ Point aRepaintPoint( aRectSize.Width() *( aFocusPosition.getX() - 1)/ nLines - 1,
aRectSize.Height() *( aFocusPosition.getY() - 1)/ nLines -1
);
- Size mRepaintSize( aRectSize.Width() *3/ nLines + 2,aRectSize.Height() *3/ nLines + 2);
- Rectangle mRepaintRect( pRepaintPoint, mRepaintSize );
+ Size aRepaintSize( aRectSize.Width() *3/ nLines + 2,aRectSize.Height() *3/ nLines + 2);
+ Rectangle aRepaintRect( aRepaintPoint, aRepaintSize );
bool bFocusPosChanged=false;
switch(nCode)
{
@@ -982,7 +979,7 @@ void SvxPixelCtl::KeyInput( const KeyEvent& rKEvt )
if((aFocusPosition.getX() >= 1))
{
aFocusPosition.setX( aFocusPosition.getX() - 1 );
- Invalidate(mRepaintRect);
+ Invalidate(aRepaintRect);
bFocusPosChanged=true;
}
break;
@@ -990,7 +987,7 @@ void SvxPixelCtl::KeyInput( const KeyEvent& rKEvt )
if( aFocusPosition.getX() < (nLines - 1) )
{
aFocusPosition.setX( aFocusPosition.getX() + 1 );
- Invalidate(mRepaintRect);
+ Invalidate(aRepaintRect);
bFocusPosChanged=true;
}
break;
@@ -998,7 +995,7 @@ void SvxPixelCtl::KeyInput( const KeyEvent& rKEvt )
if((aFocusPosition.getY() >= 1))
{
aFocusPosition.setY( aFocusPosition.getY() - 1 );
- Invalidate(mRepaintRect);
+ Invalidate(aRepaintRect);
bFocusPosChanged=true;
}
break;
@@ -1006,7 +1003,7 @@ void SvxPixelCtl::KeyInput( const KeyEvent& rKEvt )
if( aFocusPosition.getY() < ( nLines - 1 ) )
{
aFocusPosition.setY( aFocusPosition.getY() + 1 );
- Invalidate(mRepaintRect);
+ Invalidate(aRepaintRect);
bFocusPosChanged=true;
}
break;
@@ -1763,7 +1760,6 @@ void LineEndLB::Modify( const XLineEndEntry& rEntry, sal_Int32 nPos, const Bitma
}
-
void SvxPreviewBase::InitSettings(bool bForeground, bool bBackground)
{
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
@@ -1988,7 +1984,6 @@ void SvxXLinePreview::dispose()
}
-
void SvxXLinePreview::SetSymbol(Graphic* p,const Size& s)
{
mpGraphic = p;
@@ -1996,7 +1991,6 @@ void SvxXLinePreview::SetSymbol(Graphic* p,const Size& s)
}
-
void SvxXLinePreview::ResizeSymbol(const Size& s)
{
if ( s != maSymbolSize )
@@ -2007,7 +2001,6 @@ void SvxXLinePreview::ResizeSymbol(const Size& s)
}
-
void SvxXLinePreview::SetLineAttributes(const SfxItemSet& rItemSet)
{
// Set ItemSet at objects
@@ -2023,7 +2016,6 @@ void SvxXLinePreview::SetLineAttributes(const SfxItemSet& rItemSet)
}
-
void SvxXLinePreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
{
LocalPrePaint(rRenderContext);
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index a81c3690dda6..752b40da87c8 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -652,11 +652,11 @@ SaveDialog::SaveDialog(vcl::Window* pParent, RecoveryCore* pCore)
// fill listbox with current open documents
m_pFileListLB->Clear();
- TURLList& pURLs = m_pCore->getURLListAccess();
+ TURLList& rURLs = m_pCore->getURLListAccess();
TURLList::const_iterator pIt;
- for ( pIt = pURLs.begin();
- pIt != pURLs.end() ;
+ for ( pIt = rURLs.begin();
+ pIt != rURLs.end() ;
++pIt )
{
const TURLInfo& rInfo = *pIt;
@@ -902,10 +902,10 @@ RecoveryDialog::RecoveryDialog(vcl::Window* pParent, RecoveryCore* pCore)
m_pCancelBtn->SetClickHdl( LINK( this, RecoveryDialog, CancelButtonHdl ) );
// fill list box first time
- TURLList& pURLList = m_pCore->getURLListAccess();
+ TURLList& rURLList = m_pCore->getURLListAccess();
TURLList::const_iterator pIt;
- for ( pIt = pURLList.begin();
- pIt != pURLList.end() ;
+ for ( pIt = rURLList.begin();
+ pIt != rURLList.end() ;
++pIt )
{
const TURLInfo& rInfo = *pIt;
@@ -1279,10 +1279,10 @@ void BrokenRecoveryDialog::dispose()
void BrokenRecoveryDialog::impl_refresh()
{
m_bExecutionNeeded = false;
- TURLList& pURLList = m_pCore->getURLListAccess();
+ TURLList& rURLList = m_pCore->getURLListAccess();
TURLList::const_iterator pIt;
- for ( pIt = pURLList.begin();
- pIt != pURLList.end() ;
+ for ( pIt = rURLList.begin();
+ pIt != rURLList.end() ;
++pIt )
{
const TURLInfo& rInfo = *pIt;
diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index e1a97b380d6f..1757e6779e3e 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -1033,24 +1033,24 @@ void AreaPropertyPanelBase::Update()
{
const OUString aString(mpFillGradientItem->GetName());
mpLbFillAttr->SelectEntry(aString);
- const XGradient pGradient = mpFillGradientItem->GetGradientValue();
- mpLbFillGradFrom->SelectEntry(pGradient.GetStartColor());
+ const XGradient aGradient = mpFillGradientItem->GetGradientValue();
+ mpLbFillGradFrom->SelectEntry(aGradient.GetStartColor());
if(mpLbFillGradFrom->GetSelectEntryCount() == 0)
{
- mpLbFillGradFrom->InsertEntry(pGradient.GetStartColor(), OUString());
- mpLbFillGradFrom->SelectEntry(pGradient.GetStartColor());
+ mpLbFillGradFrom->InsertEntry(aGradient.GetStartColor(), OUString());
+ mpLbFillGradFrom->SelectEntry(aGradient.GetStartColor());
}
- mpLbFillGradTo->SelectEntry(pGradient.GetEndColor());
+ mpLbFillGradTo->SelectEntry(aGradient.GetEndColor());
if(mpLbFillGradTo->GetSelectEntryCount() == 0)
{
- mpLbFillGradTo->InsertEntry(pGradient.GetEndColor(), OUString());
- mpLbFillGradTo->SelectEntry(pGradient.GetEndColor());
+ mpLbFillGradTo->InsertEntry(aGradient.GetEndColor(), OUString());
+ mpLbFillGradTo->SelectEntry(aGradient.GetEndColor());
}
- mpGradientStyle->SelectEntryPos(sal::static_int_cast< sal_Int32 >( pGradient.GetGradientStyle() ));
+ mpGradientStyle->SelectEntryPos(sal::static_int_cast< sal_Int32 >( aGradient.GetGradientStyle() ));
if(mpGradientStyle->GetSelectEntryPos() == GradientStyle_RADIAL)
mpMTRAngle->Disable();
else
- mpMTRAngle->SetValue( pGradient.GetAngle() /10 );
+ mpMTRAngle->SetValue( aGradient.GetAngle() /10 );
}
else
{
diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx
index 74b4fa85b1d6..5b972a8f2c3a 100644
--- a/svx/source/table/accessiblecell.cxx
+++ b/svx/source/table/accessiblecell.cxx
@@ -241,11 +241,11 @@ Reference<XAccessibleStateSet> SAL_CALL AccessibleCell::getAccessibleStateSet()
css::uno::Reference<XAccessibleStateSet> rState =
xTempAccContext->getAccessibleStateSet();
if( rState.is() ) {
- css::uno::Sequence<short> pStates = rState->getStates();
- int count = pStates.getLength();
+ css::uno::Sequence<short> aStates = rState->getStates();
+ int count = aStates.getLength();
for( int iIndex = 0;iIndex < count;iIndex++ )
{
- if( pStates[iIndex] == AccessibleStateType::EDITABLE )
+ if( aStates[iIndex] == AccessibleStateType::EDITABLE )
{
pStateSet->AddState (AccessibleStateType::EDITABLE);
pStateSet->AddState (AccessibleStateType::RESIZABLE);
diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx
index 37212b72e797..608f66934f5d 100644
--- a/svx/source/table/tablerow.cxx
+++ b/svx/source/table/tablerow.cxx
@@ -157,7 +157,7 @@ void TableRow::removeColumns( sal_Int32 nIndex, sal_Int32 nCount )
}
}
-TableModelRef const & TableRow::getModel() const
+const TableModelRef& TableRow::getModel() const
{
return mxTableModel;
}
diff --git a/svx/source/table/tablerow.hxx b/svx/source/table/tablerow.hxx
index 5fdd94064cb0..88498f2e50f4 100644
--- a/svx/source/table/tablerow.hxx
+++ b/svx/source/table/tablerow.hxx
@@ -49,7 +49,7 @@ public:
void insertColumns( sal_Int32 nIndex, sal_Int32 nCount, CellVector::iterator* pIter = nullptr );
void removeColumns( sal_Int32 nIndex, sal_Int32 nCount );
/// Reference to the table model containing this row.
- TableModelRef const & getModel() const;
+ const TableModelRef& getModel() const;
// XCellRange
virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index e850661720fb..6333bb8c34cd 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -373,7 +373,7 @@ void SvxStyleBox_Impl::ReleaseFocus()
IMPL_LINK_TYPED( SvxStyleBox_Impl, MenuSelectHdl, Menu*, pMenu, bool)
{
- OUString sEntry = OUString( GetSelectEntry() );
+ OUString sEntry = GetSelectEntry();
ReleaseFocus(); // It must be after getting entry pos!
Sequence< PropertyValue > aArgs( 2 );
aArgs[0].Name = "Param";
@@ -840,7 +840,7 @@ IMPL_LINK_TYPED(SvxStyleBox_Impl, CalcOptimalExtraUserWidth, VclWindowEvent&, ev
// return is always the Font-Color
// when both light or dark, change the Contrast
// in other case do not change the origin color
-// when the color is R=G=B=128 the DecreaseContast make 128 the need a exception
+// when the color is R=G=B=128 the DecreaseContrast make 128 the need a exception
Color SvxStyleBox_Impl::TestColorsVisible(const Color &FontCol, const Color &BackCol)
{
const sal_uInt8 ChgVal = 60; // increase/decrease the Contrast
@@ -860,7 +860,6 @@ Color SvxStyleBox_Impl::TestColorsVisible(const Color &FontCol, const Color &Bac
}
-
static bool lcl_GetDocFontList( const FontList** ppFontList, SvxFontNameBox_Impl* pBox )
{
bool bChanged = false;
@@ -2026,7 +2025,7 @@ struct SvxStyleToolBoxControl::Impl
Reference<container::XNameAccess> xParaStyles;
xStylesSupplier->getStyleFamilies()->getByName("ParagraphStyles") >>=
xParaStyles;
- static const sal_Char* aWriterStyles[] =
+ static const std::vector<OUString> aWriterStyles =
{
"Text body",
"Quotations",
@@ -2036,12 +2035,12 @@ struct SvxStyleToolBoxControl::Impl
"Heading 2",
"Heading 3"
};
- for( sal_uInt32 nStyle = 0; nStyle < sizeof( aWriterStyles ) / sizeof( sal_Char*); ++nStyle )
+ for( const OUString& aStyle: aWriterStyles )
{
try
{
Reference< beans::XPropertySet > xStyle;
- xParaStyles->getByName( OUString::createFromAscii( aWriterStyles[nStyle] )) >>= xStyle;
+ xParaStyles->getByName( aStyle ) >>= xStyle;
OUString sName;
xStyle->getPropertyValue("DisplayName") >>= sName;
if( !sName.isEmpty() )
@@ -2065,7 +2064,7 @@ struct SvxStyleToolBoxControl::Impl
};
Reference<container::XNameAccess> xCellStyles;
xStylesSupplier->getStyleFamilies()->getByName("CellStyles") >>= xCellStyles;
- for( sal_uInt32 nStyle = 0; nStyle < sizeof( aCalcStyles ) / sizeof( sal_Char*); ++nStyle )
+ for( sal_uInt32 nStyle = 0; nStyle < SAL_N_ELEMENTS(aCalcStyles); ++nStyle )
{
try
{
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 58cd9b4c7bd5..9c70a6556b21 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -282,10 +282,10 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject()
mpOStm->Seek( 0 );
sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW;
- sal_uInt16 pDeterminedFormat = GRFILTER_FORMAT_DONTKNOW;
- GraphicFilter::GetGraphicFilter().ImportGraphic( aGraphic, "", *mpOStm ,nFormat,&pDeterminedFormat );
+ sal_uInt16 nDeterminedFormat = GRFILTER_FORMAT_DONTKNOW;
+ GraphicFilter::GetGraphicFilter().ImportGraphic( aGraphic, "", *mpOStm ,nFormat,&nDeterminedFormat );
- if (pDeterminedFormat == GRFILTER_FORMAT_DONTKNOW)
+ if (nDeterminedFormat == GRFILTER_FORMAT_DONTKNOW)
{
//Read the first two byte to check whether it is a gzipped stream, is so it may be in wmz or emz format
//unzip them and try again
@@ -326,7 +326,7 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject()
if (nStreamLen_)
{
pDest->Seek(0L);
- GraphicFilter::GetGraphicFilter().ImportGraphic( aGraphic, "", *pDest ,nFormat,&pDeterminedFormat );
+ GraphicFilter::GetGraphicFilter().ImportGraphic( aGraphic, "", *pDest ,nFormat,&nDeterminedFormat );
}
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 07:29:14 +0000