[Libreoffice-commits] core.git: sdext/source
Noel Grandin
noel at peralex.com
Wed Oct 28 23:52:52 PDT 2015
sdext/source/minimizer/configurationaccess.cxx | 4 -
sdext/source/minimizer/fileopendialog.cxx | 2
sdext/source/minimizer/impoptimizer.cxx | 4 -
sdext/source/minimizer/informationdialog.cxx | 8 +-
sdext/source/minimizer/optimizationstats.cxx | 2
sdext/source/minimizer/optimizerdialog.cxx | 42 +++++++--------
sdext/source/minimizer/pagecollector.cxx | 4 -
sdext/source/minimizer/pppoptimizer.cxx | 12 ++--
sdext/source/minimizer/pppoptimizerdialog.cxx | 12 ++--
sdext/source/pdfimport/sax/saxattrlist.cxx | 4 -
sdext/source/pdfimport/tree/drawtreevisiting.cxx | 12 ++--
sdext/source/pdfimport/tree/pdfiprocessor.cxx | 2
sdext/source/pdfimport/wrapper/wrapper.cxx | 2
sdext/source/presenter/PresenterAccessibility.cxx | 8 +-
sdext/source/presenter/PresenterButton.cxx | 2
sdext/source/presenter/PresenterController.cxx | 2
sdext/source/presenter/PresenterCurrentSlideObserver.cxx | 4 -
sdext/source/presenter/PresenterNotesView.cxx | 2
sdext/source/presenter/PresenterPaneBase.cxx | 2
sdext/source/presenter/PresenterPaneBase.hxx | 2
sdext/source/presenter/PresenterPaneBorderManager.cxx | 2
sdext/source/presenter/PresenterPaneBorderPainter.cxx | 2
sdext/source/presenter/PresenterPaneContainer.cxx | 4 -
sdext/source/presenter/PresenterPaneFactory.cxx | 2
sdext/source/presenter/PresenterProtocolHandler.cxx | 4 -
sdext/source/presenter/PresenterScreen.cxx | 4 -
sdext/source/presenter/PresenterSlidePreview.cxx | 2
sdext/source/presenter/PresenterSlideShowView.cxx | 2
sdext/source/presenter/PresenterToolBar.cxx | 2
sdext/source/presenter/PresenterViewFactory.cxx | 2
sdext/source/presenter/PresenterWindowManager.cxx | 2
31 files changed, 80 insertions(+), 80 deletions(-)
New commits:
commit ab20a5888d3a7f964ef2fb3afe2477825da6037e
Author: Noel Grandin <noel at peralex.com>
Date: Wed Oct 28 12:09:09 2015 +0200
com::sun::star->css in sdext
Change-Id: I1720391c6842a75033aca4e1b852a8cb89ca1efa
Reviewed-on: https://gerrit.libreoffice.org/19638
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
Tested-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx
index d276149..942fc2b 100644
--- a/sdext/source/minimizer/configurationaccess.cxx
+++ b/sdext/source/minimizer/configurationaccess.cxx
@@ -349,7 +349,7 @@ Reference< XInterface > ConfigurationAccess::GetConfigurationNode(
return xNode;
}
-com::sun::star::uno::Any ConfigurationAccess::GetConfigProperty( const PPPOptimizerTokenEnum ePropertyToken ) const
+css::uno::Any ConfigurationAccess::GetConfigProperty( const PPPOptimizerTokenEnum ePropertyToken ) const
{
Any aRetValue;
const OptimizerSettings& rSettings( maSettings.front() );
@@ -383,7 +383,7 @@ com::sun::star::uno::Any ConfigurationAccess::GetConfigProperty( const PPPOptimi
return aRetValue;
}
-void ConfigurationAccess::SetConfigProperty( const PPPOptimizerTokenEnum ePropertyToken, const com::sun::star::uno::Any& rValue )
+void ConfigurationAccess::SetConfigProperty( const PPPOptimizerTokenEnum ePropertyToken, const css::uno::Any& rValue )
{
OptimizerSettings& rSettings( maSettings.front() );
try
diff --git a/sdext/source/minimizer/fileopendialog.cxx b/sdext/source/minimizer/fileopendialog.cxx
index c327ea5..0cf2b82 100644
--- a/sdext/source/minimizer/fileopendialog.cxx
+++ b/sdext/source/minimizer/fileopendialog.cxx
@@ -65,7 +65,7 @@ FileOpenDialog::FileOpenDialog( const Reference< XComponentContext >& rxContext
{
xAccess->setValue( ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION, 0, Any( true ) );
}
- catch( com::sun::star::uno::Exception& )
+ catch( css::uno::Exception& )
{}
}
diff --git a/sdext/source/minimizer/impoptimizer.cxx b/sdext/source/minimizer/impoptimizer.cxx
index 318ab61..db7a788 100644
--- a/sdext/source/minimizer/impoptimizer.cxx
+++ b/sdext/source/minimizer/impoptimizer.cxx
@@ -265,7 +265,7 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >&
if ( xGraphicPropertySet->getPropertyValue( "MimeType" ) >>= aSourceMimeType )
{
sal_Int8 nGraphicType( xGraphic->getType() );
- if ( nGraphicType == com::sun::star::graphic::GraphicType::PIXEL )
+ if ( nGraphicType == css::graphic::GraphicType::PIXEL )
{
bool bTransparent = false;
bool bAlpha = false;
@@ -615,7 +615,7 @@ bool ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments )
case TK_InformationDialog: rArguments[ i ].Value >>= mxInformationDialog; break;
case TK_Settings :
{
- com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aSettings;
+ css::uno::Sequence< css::beans::PropertyValue > aSettings;
int j, nJCount;
rArguments[ i ].Value >>= aSettings;
for ( j = 0, nJCount = aSettings.getLength(); j < nJCount; j++ )
diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx
index 84987e6..d50d20b 100644
--- a/sdext/source/minimizer/informationdialog.cxx
+++ b/sdext/source/minimizer/informationdialog.cxx
@@ -296,7 +296,7 @@ void InformationDialog::InitDialog()
if ( k >= 0 )
aInfoString = aInfoString.replaceAt( k, aTitlePlaceholder.getLength(), aTitle );
- com::sun::star::uno::Reference< com::sun::star::awt::XItemListener > xItemListener;
+ css::uno::Reference< css::awt::XItemListener > xItemListener;
InsertImage( *this,
OUString( "aboutimage" ),
OUString( "private:standardimage/query" ),
@@ -359,15 +359,15 @@ bool InformationDialog::execute()
void OKActionListener::actionPerformed( const ActionEvent& rEvent )
- throw ( com::sun::star::uno::RuntimeException, std::exception )
+ throw ( css::uno::RuntimeException, std::exception )
{
if ( rEvent.ActionCommand == "button" )
{
mrInformationDialog.endExecute( true );
}
}
-void OKActionListener::disposing( const ::com::sun::star::lang::EventObject& /* Source */ )
- throw ( com::sun::star::uno::RuntimeException, std::exception )
+void OKActionListener::disposing( const css::lang::EventObject& /* Source */ )
+ throw ( css::uno::RuntimeException, std::exception )
{
}
diff --git a/sdext/source/minimizer/optimizationstats.cxx b/sdext/source/minimizer/optimizationstats.cxx
index 7622570..03a07e2 100644
--- a/sdext/source/minimizer/optimizationstats.cxx
+++ b/sdext/source/minimizer/optimizationstats.cxx
@@ -54,7 +54,7 @@ const uno::Any* OptimizationStats::GetStatusValue( const PPPOptimizerTokenEnum e
-com::sun::star::beans::PropertyValues OptimizationStats::GetStatusSequence()
+css::beans::PropertyValues OptimizationStats::GetStatusSequence()
{
int i = 0;
uno::Sequence< PropertyValue > aStatsSequence( maStats.size() );
diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx
index 0a37e6b..a211411 100644
--- a/sdext/source/minimizer/optimizerdialog.cxx
+++ b/sdext/source/minimizer/optimizerdialog.cxx
@@ -329,7 +329,7 @@ OUString OptimizerDialog::GetSelectedString( OUString const & token )
-void OptimizerDialog::UpdateStatus( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rStatus )
+void OptimizerDialog::UpdateStatus( const css::uno::Sequence< css::beans::PropertyValue >& rStatus )
{
if ( mxReschedule.is() )
{
@@ -489,15 +489,15 @@ void ItemListener::itemStateChanged( const ItemEvent& Event )
}
}
-void ItemListener::disposing( const ::com::sun::star::lang::EventObject& /* Source */ )
- throw ( com::sun::star::uno::RuntimeException, std::exception )
+void ItemListener::disposing( const css::lang::EventObject& /* Source */ )
+ throw ( css::uno::RuntimeException, std::exception )
{
}
void ActionListener::actionPerformed( const ActionEvent& rEvent )
- throw ( com::sun::star::uno::RuntimeException, std::exception )
+ throw ( css::uno::RuntimeException, std::exception )
{
switch( TKGet( rEvent.ActionCommand ) )
{
@@ -639,15 +639,15 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent )
default: break;
}
}
-void ActionListener::disposing( const ::com::sun::star::lang::EventObject& /* Source */ )
- throw ( com::sun::star::uno::RuntimeException, std::exception )
+void ActionListener::disposing( const css::lang::EventObject& /* Source */ )
+ throw ( css::uno::RuntimeException, std::exception )
{
}
void ActionListenerListBox0Pg0::actionPerformed( const ActionEvent& rEvent )
- throw ( com::sun::star::uno::RuntimeException, std::exception )
+ throw ( css::uno::RuntimeException, std::exception )
{
if ( !rEvent.ActionCommand.isEmpty() )
{
@@ -658,30 +658,30 @@ void ActionListenerListBox0Pg0::actionPerformed( const ActionEvent& rEvent )
}
mrOptimizerDialog.UpdateControlStates();
}
-void ActionListenerListBox0Pg0::disposing( const ::com::sun::star::lang::EventObject& /* Source */ )
- throw ( com::sun::star::uno::RuntimeException, std::exception )
+void ActionListenerListBox0Pg0::disposing( const css::lang::EventObject& /* Source */ )
+ throw ( css::uno::RuntimeException, std::exception )
{
}
void TextListenerFormattedField0Pg1::textChanged( const TextEvent& /* rEvent */ )
- throw ( com::sun::star::uno::RuntimeException, std::exception )
+ throw ( css::uno::RuntimeException, std::exception )
{
double fDouble = 0;
Any aAny = mrOptimizerDialog.getControlProperty( "FormattedField0Pg1", "EffectiveValue" );
if ( aAny >>= fDouble )
mrOptimizerDialog.SetConfigProperty( TK_JPEGQuality, Any( (sal_Int32)fDouble ) );
}
-void TextListenerFormattedField0Pg1::disposing( const ::com::sun::star::lang::EventObject& /* Source */ )
- throw ( com::sun::star::uno::RuntimeException, std::exception )
+void TextListenerFormattedField0Pg1::disposing( const css::lang::EventObject& /* Source */ )
+ throw ( css::uno::RuntimeException, std::exception )
{
}
void TextListenerComboBox0Pg1::textChanged( const TextEvent& /* rEvent */ )
- throw ( com::sun::star::uno::RuntimeException, std::exception )
+ throw ( css::uno::RuntimeException, std::exception )
{
OUString aString;
Any aAny = mrOptimizerDialog.getControlProperty( "ComboBox0Pg1", "Text" );
@@ -702,15 +702,15 @@ void TextListenerComboBox0Pg1::textChanged( const TextEvent& /* rEvent */ )
mrOptimizerDialog.SetConfigProperty( TK_ImageResolution, Any( aString.toInt32() ) );
}
}
-void TextListenerComboBox0Pg1::disposing( const ::com::sun::star::lang::EventObject& /* Source */ )
- throw ( com::sun::star::uno::RuntimeException, std::exception )
+void TextListenerComboBox0Pg1::disposing( const css::lang::EventObject& /* Source */ )
+ throw ( css::uno::RuntimeException, std::exception )
{
}
void SpinListenerFormattedField0Pg1::up( const SpinEvent& /* rEvent */ )
- throw ( com::sun::star::uno::RuntimeException, std::exception )
+ throw ( css::uno::RuntimeException, std::exception )
{
double fDouble;
Any aAny = mrOptimizerDialog.getControlProperty( "FormattedField0Pg1", "EffectiveValue" );
@@ -724,7 +724,7 @@ void SpinListenerFormattedField0Pg1::up( const SpinEvent& /* rEvent */ )
}
}
void SpinListenerFormattedField0Pg1::down( const SpinEvent& /* rEvent */ )
- throw ( com::sun::star::uno::RuntimeException, std::exception )
+ throw ( css::uno::RuntimeException, std::exception )
{
double fDouble;
Any aAny = mrOptimizerDialog.getControlProperty( "FormattedField0Pg1", "EffectiveValue" );
@@ -738,19 +738,19 @@ void SpinListenerFormattedField0Pg1::down( const SpinEvent& /* rEvent */ )
}
}
void SpinListenerFormattedField0Pg1::first( const SpinEvent& /* rEvent */ )
- throw ( com::sun::star::uno::RuntimeException, std::exception )
+ throw ( css::uno::RuntimeException, std::exception )
{
mrOptimizerDialog.setControlProperty( "FormattedField0Pg1", "EffectiveValue", Any( static_cast< double >( 0 ) ) );
mrOptimizerDialog.SetConfigProperty( TK_JPEGQuality, Any( (sal_Int32)0 ) );
}
void SpinListenerFormattedField0Pg1::last( const SpinEvent& /* rEvent */ )
- throw ( com::sun::star::uno::RuntimeException, std::exception )
+ throw ( css::uno::RuntimeException, std::exception )
{
mrOptimizerDialog.setControlProperty( "FormattedField0Pg1", "EffectiveValue", Any( static_cast< double >( 100 ) ) );
mrOptimizerDialog.SetConfigProperty( TK_JPEGQuality, Any( (sal_Int32)100 ) );
}
-void SpinListenerFormattedField0Pg1::disposing( const ::com::sun::star::lang::EventObject& /* Source */ )
- throw ( com::sun::star::uno::RuntimeException, std::exception )
+void SpinListenerFormattedField0Pg1::disposing( const css::lang::EventObject& /* Source */ )
+ throw ( css::uno::RuntimeException, std::exception )
{
}
diff --git a/sdext/source/minimizer/pagecollector.cxx b/sdext/source/minimizer/pagecollector.cxx
index 753119a..a45ac68 100644
--- a/sdext/source/minimizer/pagecollector.cxx
+++ b/sdext/source/minimizer/pagecollector.cxx
@@ -36,7 +36,7 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::presentation;
-void PageCollector::CollectCustomShowPages( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rxModel, const OUString& rCustomShowName, std::vector< Reference< XDrawPage > >& rUsedPageList )
+void PageCollector::CollectCustomShowPages( const css::uno::Reference< css::frame::XModel >& rxModel, const OUString& rCustomShowName, std::vector< Reference< XDrawPage > >& rUsedPageList )
{
try
{
@@ -78,7 +78,7 @@ void PageCollector::CollectCustomShowPages( const com::sun::star::uno::Reference
}
}
-void PageCollector::CollectNonCustomShowPages( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rxModel, const OUString& rCustomShowName, std::vector< Reference< XDrawPage > >& rNonUsedPageList )
+void PageCollector::CollectNonCustomShowPages( const css::uno::Reference< css::frame::XModel >& rxModel, const OUString& rCustomShowName, std::vector< Reference< XDrawPage > >& rNonUsedPageList )
{
try
{
diff --git a/sdext/source/minimizer/pppoptimizer.cxx b/sdext/source/minimizer/pppoptimizer.cxx
index f6341f6..74219a8 100644
--- a/sdext/source/minimizer/pppoptimizer.cxx
+++ b/sdext/source/minimizer/pppoptimizer.cxx
@@ -50,7 +50,7 @@ PPPOptimizer::~PPPOptimizer()
// XDispatchProvider
-Reference< com::sun::star::frame::XDispatch > SAL_CALL PPPOptimizer::queryDispatch(
+Reference< css::frame::XDispatch > SAL_CALL PPPOptimizer::queryDispatch(
const URL& aURL, const OUString& /* aTargetFrameName */, sal_Int32 /* nSearchFlags */ ) throw( RuntimeException, std::exception )
{
Reference < XDispatch > xRet;
@@ -64,12 +64,12 @@ Reference< com::sun::star::frame::XDispatch > SAL_CALL PPPOptimizer::queryDispat
-Sequence< Reference< com::sun::star::frame::XDispatch > > SAL_CALL PPPOptimizer::queryDispatches(
- const Sequence< com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw( RuntimeException, std::exception )
+Sequence< Reference< css::frame::XDispatch > > SAL_CALL PPPOptimizer::queryDispatches(
+ const Sequence< css::frame::DispatchDescriptor >& aDescripts ) throw( RuntimeException, std::exception )
{
- Sequence< Reference< com::sun::star::frame::XDispatch> > aReturn( aDescripts.getLength() );
- Reference< com::sun::star::frame::XDispatch>* pReturn = aReturn.getArray();
- const com::sun::star::frame::DispatchDescriptor* pDescripts = aDescripts.getConstArray();
+ Sequence< Reference< css::frame::XDispatch> > aReturn( aDescripts.getLength() );
+ Reference< css::frame::XDispatch>* pReturn = aReturn.getArray();
+ const css::frame::DispatchDescriptor* pDescripts = aDescripts.getConstArray();
for (sal_Int32 i = 0; i < aDescripts.getLength(); ++i, ++pReturn, ++pDescripts )
{
*pReturn = queryDispatch( pDescripts->FeatureURL, pDescripts->FrameName, pDescripts->SearchFlags );
diff --git a/sdext/source/minimizer/pppoptimizerdialog.cxx b/sdext/source/minimizer/pppoptimizerdialog.cxx
index 312cf08..049c77e 100644
--- a/sdext/source/minimizer/pppoptimizerdialog.cxx
+++ b/sdext/source/minimizer/pppoptimizerdialog.cxx
@@ -70,7 +70,7 @@ Sequence< OUString > SAL_CALL PPPOptimizerDialog::getSupportedServiceNames()
return PPPOptimizerDialog_getSupportedServiceNames();
}
-Reference< com::sun::star::frame::XDispatch > SAL_CALL PPPOptimizerDialog::queryDispatch(
+Reference< css::frame::XDispatch > SAL_CALL PPPOptimizerDialog::queryDispatch(
const URL& aURL, const OUString& /* aTargetFrameName */, sal_Int32 /* nSearchFlags */ ) throw( RuntimeException, std::exception )
{
Reference < XDispatch > xRet;
@@ -80,12 +80,12 @@ Reference< com::sun::star::frame::XDispatch > SAL_CALL PPPOptimizerDialog::query
return xRet;
}
-Sequence< Reference< com::sun::star::frame::XDispatch > > SAL_CALL PPPOptimizerDialog::queryDispatches(
- const Sequence< com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw( RuntimeException, std::exception )
+Sequence< Reference< css::frame::XDispatch > > SAL_CALL PPPOptimizerDialog::queryDispatches(
+ const Sequence< css::frame::DispatchDescriptor >& aDescripts ) throw( RuntimeException, std::exception )
{
- Sequence< Reference< com::sun::star::frame::XDispatch> > aReturn( aDescripts.getLength() );
- Reference< com::sun::star::frame::XDispatch>* pReturn = aReturn.getArray();
- const com::sun::star::frame::DispatchDescriptor* pDescripts = aDescripts.getConstArray();
+ Sequence< Reference< css::frame::XDispatch> > aReturn( aDescripts.getLength() );
+ Reference< css::frame::XDispatch>* pReturn = aReturn.getArray();
+ const css::frame::DispatchDescriptor* pDescripts = aDescripts.getConstArray();
for (sal_Int32 i = 0; i < aDescripts.getLength(); ++i, ++pReturn, ++pDescripts )
{
*pReturn = queryDispatch( pDescripts->FeatureURL, pDescripts->FrameName, pDescripts->SearchFlags );
diff --git a/sdext/source/pdfimport/sax/saxattrlist.cxx b/sdext/source/pdfimport/sax/saxattrlist.cxx
index 7a3d4fd..87d804b 100644
--- a/sdext/source/pdfimport/sax/saxattrlist.cxx
+++ b/sdext/source/pdfimport/sax/saxattrlist.cxx
@@ -37,7 +37,7 @@ SaxAttrList::SaxAttrList( const std::unordered_map< OUString, OUString, OUString
}
SaxAttrList::SaxAttrList( const SaxAttrList& rClone ) :
- cppu::WeakImplHelper<com::sun::star::xml::sax::XAttributeList, com::sun::star::util::XCloneable>(rClone),
+ cppu::WeakImplHelper<css::xml::sax::XAttributeList, css::util::XCloneable>(rClone),
m_aAttributes( rClone.m_aAttributes ),
m_aIndexMap( rClone.m_aIndexMap )
{
@@ -84,7 +84,7 @@ OUString SAL_CALL SaxAttrList::getValueByName(const OUString& i_rName) throw(std
return (it != m_aIndexMap.end()) ? m_aAttributes[it->second].m_aValue : OUString();
}
-com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL SaxAttrList::createClone() throw(std::exception)
+css::uno::Reference< css::util::XCloneable > SAL_CALL SaxAttrList::createClone() throw(std::exception)
{
return new SaxAttrList( *this );
}
diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
index b2f8b16..bae383c 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
@@ -115,10 +115,10 @@ void DrawXmlEmitter::visit( TextElement& elem, const std::list< Element* >::cons
for(int i=1; i< elem.Text.getLength(); i++)
{
sal_Int16 nType = xCC->getCharacterDirection( str, i );
- if ( nType == ::com::sun::star::i18n::DirectionProperty_RIGHT_TO_LEFT ||
- nType == ::com::sun::star::i18n::DirectionProperty_RIGHT_TO_LEFT_ARABIC ||
- nType == ::com::sun::star::i18n::DirectionProperty_RIGHT_TO_LEFT_EMBEDDING ||
- nType == ::com::sun::star::i18n::DirectionProperty_RIGHT_TO_LEFT_OVERRIDE
+ if ( nType == css::i18n::DirectionProperty_RIGHT_TO_LEFT ||
+ nType == css::i18n::DirectionProperty_RIGHT_TO_LEFT_ARABIC ||
+ nType == css::i18n::DirectionProperty_RIGHT_TO_LEFT_EMBEDDING ||
+ nType == css::i18n::DirectionProperty_RIGHT_TO_LEFT_OVERRIDE
)
isRTL = true;
}
@@ -696,7 +696,7 @@ void DrawXmlOptimizer::optimizeTextElements(Element& rParent)
for(int i=0; i< str.getLength(); i++)
{
sal_Int16 nType = GetBreakIterator()->getScriptType( str, i );
- if (nType == ::com::sun::star::i18n::ScriptType::COMPLEX)
+ if (nType == css::i18n::ScriptType::COMPLEX)
isComplex = true;
}
bool bPara = strspn("ParagraphElement", typeid(rParent).name());
@@ -728,7 +728,7 @@ void DrawXmlOptimizer::optimizeTextElements(Element& rParent)
for(int i=0; i< str.getLength(); i++)
{
sal_Int16 nType = GetBreakIterator()->getScriptType( str, i );
- if (nType == ::com::sun::star::i18n::ScriptType::COMPLEX)
+ if (nType == css::i18n::ScriptType::COMPLEX)
isComplex = true;
}
if (bPara && pPara && isComplex)
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
index 766d1e6..96310cf 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -53,7 +53,7 @@ namespace pdfi
{
PDFIProcessor::PDFIProcessor( const uno::Reference< task::XStatusIndicator >& xStat ,
- com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext) :
+ css::uno::Reference< css::uno::XComponentContext > xContext) :
m_xContext(xContext),
prevCharWidth(0),
diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx
index 92d72dc..0716e7d 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -1225,7 +1225,7 @@ bool xpdf_ImportFromStream( const uno::Reference< io::XInputStream >& xI
{
nBytes = xInput->readBytes( aBuf, nBufSize );
}
- catch( com::sun::star::uno::Exception& )
+ catch( css::uno::Exception& )
{
osl_closeFile( aFile );
throw;
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx
index 91c7d86..f62389d 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -331,10 +331,10 @@ public:
throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL setCaretPosition (sal_Int32 nIndex)
- throw (::com::sun::star::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
virtual sal_Unicode SAL_CALL getCharacter (sal_Int32 nIndex)
- throw (::com::sun::star::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence<css::beans::PropertyValue> SAL_CALL
getCharacterAttributes (
@@ -1541,7 +1541,7 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getCaretPosition()
}
sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setCaretPosition (sal_Int32 nIndex)
- throw (::com::sun::star::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
+ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
{
ThrowIfDisposed();
@@ -1555,7 +1555,7 @@ sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setCaretPosition (sa
}
sal_Unicode SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacter (sal_Int32 nIndex)
- throw (::com::sun::star::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
+ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
{
ThrowIfDisposed();
diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx
index 7579563..7895973 100644
--- a/sdext/source/presenter/PresenterButton.cxx
+++ b/sdext/source/presenter/PresenterButton.cxx
@@ -504,7 +504,7 @@ Reference<beans::XPropertySet> PresenterButton::GetConfigurationProperties (
}
void PresenterButton::ThrowIfDisposed() const
- throw (::com::sun::star::lang::DisposedException)
+ throw (css::lang::DisposedException)
{
if (rBHelper.bDisposed || rBHelper.bInDispose)
{
diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx
index d33db36..253ea09 100644
--- a/sdext/source/presenter/PresenterController.cxx
+++ b/sdext/source/presenter/PresenterController.cxx
@@ -1217,7 +1217,7 @@ void PresenterController::UpdatePendingSlideNumber (const sal_Int32 nPendingSlid
}
void PresenterController::ThrowIfDisposed() const
- throw (::com::sun::star::lang::DisposedException)
+ throw (css::lang::DisposedException)
{
if (rBHelper.bDisposed || rBHelper.bInDispose)
{
diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx
index 4ee448c..a3a8eee 100644
--- a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx
+++ b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx
@@ -78,13 +78,13 @@ void SAL_CALL PresenterCurrentSlideObserver::endEvent (
void SAL_CALL PresenterCurrentSlideObserver::repeat (
const css::uno::Reference<css::animations::XAnimationNode>& rNode,
sal_Int32)
- throw (com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
(void)rNode;
}
void SAL_CALL PresenterCurrentSlideObserver::paused()
- throw (com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
}
diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx
index e1be7c3..84839b1 100644
--- a/sdext/source/presenter/PresenterNotesView.cxx
+++ b/sdext/source/presenter/PresenterNotesView.cxx
@@ -701,7 +701,7 @@ void PresenterNotesView::UpdateScrollBar()
}
void PresenterNotesView::ThrowIfDisposed()
- throw (::com::sun::star::lang::DisposedException)
+ throw (css::lang::DisposedException)
{
if (rBHelper.bDisposed || rBHelper.bInDispose)
{
diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx
index 0195c66..5af4c5e 100644
--- a/sdext/source/presenter/PresenterPaneBase.cxx
+++ b/sdext/source/presenter/PresenterPaneBase.cxx
@@ -442,7 +442,7 @@ bool PresenterPaneBase::IsVisible() const
}
void PresenterPaneBase::ThrowIfDisposed()
- throw (::com::sun::star::lang::DisposedException)
+ throw (css::lang::DisposedException)
{
if (rBHelper.bDisposed || rBHelper.bInDispose)
{
diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sdext/source/presenter/PresenterPaneBase.hxx
index ee18970..18037bf 100644
--- a/sdext/source/presenter/PresenterPaneBase.hxx
+++ b/sdext/source/presenter/PresenterPaneBase.hxx
@@ -90,7 +90,7 @@ public:
throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL isAnchorOnly()
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XWindowListener
diff --git a/sdext/source/presenter/PresenterPaneBorderManager.cxx b/sdext/source/presenter/PresenterPaneBorderManager.cxx
index f8d8c3f..852e6c5 100644
--- a/sdext/source/presenter/PresenterPaneBorderManager.cxx
+++ b/sdext/source/presenter/PresenterPaneBorderManager.cxx
@@ -491,7 +491,7 @@ void PresenterPaneBorderManager::ReleaseMouse (const Reference<awt::XWindow>& rx
}
void PresenterPaneBorderManager::ThrowIfDisposed()
- throw (::com::sun::star::lang::DisposedException)
+ throw (css::lang::DisposedException)
{
if (rBHelper.bDisposed || rBHelper.bInDispose)
{
diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
index 31b260b..249a57c 100644
--- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx
+++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
@@ -377,7 +377,7 @@ awt::Rectangle PresenterPaneBorderPainter::RemoveBorder (
}
void PresenterPaneBorderPainter::ThrowIfDisposed() const
- throw (::com::sun::star::lang::DisposedException)
+ throw (css::lang::DisposedException)
{
if (rBHelper.bDisposed || rBHelper.bInDispose)
{
diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx b/sdext/source/presenter/PresenterPaneContainer.cxx
index 6d0d595..5eb4e16 100644
--- a/sdext/source/presenter/PresenterPaneContainer.cxx
+++ b/sdext/source/presenter/PresenterPaneContainer.cxx
@@ -360,8 +360,8 @@ void PresenterPaneContainer::ToTop (const SharedPaneDescriptor& rpDescriptor)
//----- XEventListener --------------------------------------------------------
void SAL_CALL PresenterPaneContainer::disposing (
- const com::sun::star::lang::EventObject& rEvent)
- throw (com::sun::star::uno::RuntimeException, std::exception)
+ const css::lang::EventObject& rEvent)
+ throw (css::uno::RuntimeException, std::exception)
{
SharedPaneDescriptor pDescriptor (
FindContentWindow(Reference<awt::XWindow>(rEvent.Source, UNO_QUERY)));
diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx
index 008f09c..ed8a376 100644
--- a/sdext/source/presenter/PresenterPaneFactory.cxx
+++ b/sdext/source/presenter/PresenterPaneFactory.cxx
@@ -322,7 +322,7 @@ Reference<XResource> PresenterPaneFactory::CreatePane (
}
void PresenterPaneFactory::ThrowIfDisposed() const
- throw (::com::sun::star::lang::DisposedException)
+ throw (css::lang::DisposedException)
{
if (rBHelper.bDisposed || rBHelper.bInDispose)
{
diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx
index 26537af..d4adf3d 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.cxx
+++ b/sdext/source/presenter/PresenterProtocolHandler.cxx
@@ -355,7 +355,7 @@ Sequence<Reference<frame::XDispatch> > SAL_CALL PresenterProtocolHandler::queryD
void PresenterProtocolHandler::ThrowIfDisposed() const
- throw (::com::sun::star::lang::DisposedException)
+ throw (css::lang::DisposedException)
{
if (rBHelper.bDisposed || rBHelper.bInDispose)
{
@@ -513,7 +513,7 @@ void SAL_CALL PresenterProtocolHandler::Dispatch::removeStatusListener (
}
void PresenterProtocolHandler::Dispatch::ThrowIfDisposed() const
- throw (::com::sun::star::lang::DisposedException)
+ throw (css::lang::DisposedException)
{
if (rBHelper.bDisposed || rBHelper.bInDispose)
{
diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx
index f4698b4..d6dee3b 100644
--- a/sdext/source/presenter/PresenterScreen.cxx
+++ b/sdext/source/presenter/PresenterScreen.cxx
@@ -87,7 +87,7 @@ namespace {
css::uno::Reference<css::uno::XComponentContext> mxComponentContext;
rtl::Reference<PresenterScreen> mpPresenterScreen;
- void ThrowIfDisposed() const throw (::com::sun::star::lang::DisposedException);
+ void ThrowIfDisposed() const throw (css::lang::DisposedException);
};
}
@@ -249,7 +249,7 @@ void SAL_CALL PresenterScreenListener::disposing (const css::lang::EventObject&
}
void PresenterScreenListener::ThrowIfDisposed() const throw (
- ::com::sun::star::lang::DisposedException)
+ css::lang::DisposedException)
{
if (rBHelper.bDisposed || rBHelper.bInDispose)
{
diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx b/sdext/source/presenter/PresenterSlidePreview.cxx
index 6b2047d..fda5752 100644
--- a/sdext/source/presenter/PresenterSlidePreview.cxx
+++ b/sdext/source/presenter/PresenterSlidePreview.cxx
@@ -387,7 +387,7 @@ void PresenterSlidePreview::Resize()
}
void PresenterSlidePreview::ThrowIfDisposed()
- throw (::com::sun::star::lang::DisposedException)
+ throw (css::lang::DisposedException)
{
if (PresenterSlidePreviewInterfaceBase::rBHelper.bDisposed || PresenterSlidePreviewInterfaceBase::rBHelper.bInDispose)
{
diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx
index ca5c1ae..c15a9e9 100644
--- a/sdext/source/presenter/PresenterSlideShowView.cxx
+++ b/sdext/source/presenter/PresenterSlideShowView.cxx
@@ -990,7 +990,7 @@ void PresenterSlideShowView::CreateBackgroundPolygons()
}
void PresenterSlideShowView::ThrowIfDisposed()
- throw (::com::sun::star::lang::DisposedException)
+ throw (css::lang::DisposedException)
{
if (rBHelper.bDisposed || rBHelper.bInDispose)
{
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
index 328710e..1a5969a 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -1056,7 +1056,7 @@ void PresenterToolBar::CheckMouseOver (
}
void PresenterToolBar::ThrowIfDisposed() const
- throw (::com::sun::star::lang::DisposedException)
+ throw (css::lang::DisposedException)
{
if (rBHelper.bDisposed || rBHelper.bInDispose)
{
diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx
index 87b0a9c..073fae4 100644
--- a/sdext/source/presenter/PresenterViewFactory.cxx
+++ b/sdext/source/presenter/PresenterViewFactory.cxx
@@ -514,7 +514,7 @@ Reference<XView> PresenterViewFactory::CreateHelpView(
}
void PresenterViewFactory::ThrowIfDisposed() const
- throw (::com::sun::star::lang::DisposedException)
+ throw (css::lang::DisposedException)
{
if (rBHelper.bDisposed || rBHelper.bInDispose)
{
diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx
index 8d08bc0..9d62d96 100644
--- a/sdext/source/presenter/PresenterWindowManager.cxx
+++ b/sdext/source/presenter/PresenterWindowManager.cxx
@@ -1189,7 +1189,7 @@ void PresenterWindowManager::Update()
}
void PresenterWindowManager::ThrowIfDisposed() const
- throw (::com::sun::star::lang::DisposedException)
+ throw (css::lang::DisposedException)
{
if (rBHelper.bDisposed || rBHelper.bInDispose)
{
More information about the Libreoffice-commits
mailing list