[Libreoffice-commits] core.git: 3 commits - filter/source forms/source fpicker/source framework/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Feb 9 16:07:37 UTC 2019
filter/source/config/cache/filtercache.cxx | 6
filter/source/config/cache/filterfactory.cxx | 2
filter/source/graphicfilter/ieps/ieps.cxx | 4
filter/source/graphicfilter/ios2met/ios2met.cxx | 3
filter/source/graphicfilter/ipict/ipict.cxx | 10
filter/source/graphicfilter/ipsd/ipsd.cxx | 4
filter/source/msfilter/eschesdo.cxx | 4
filter/source/msfilter/msoleexp.cxx | 10
filter/source/msfilter/msvbahelper.cxx | 4
filter/source/msfilter/svdfppt.cxx | 62 +--
filter/source/svg/svgexport.cxx | 2
filter/source/svg/svgwriter.cxx | 76 ++--
filter/source/t602/t602filter.cxx | 4
filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx | 8
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 8
filter/source/xsltdialog/xmlfiltertestdialog.cxx | 4
forms/source/component/FormComponent.cxx | 2
forms/source/component/FormattedField.cxx | 4
forms/source/component/ImageControl.cxx | 2
forms/source/misc/InterfaceContainer.cxx | 10
fpicker/source/office/OfficeFilePicker.cxx | 2
fpicker/source/office/RemoteFilesDialog.cxx | 2
fpicker/source/office/iodlg.cxx | 6
framework/source/accelerators/acceleratorconfiguration.cxx | 5
framework/source/accelerators/presethandler.cxx | 20 -
framework/source/dispatch/dispatchinformationprovider.cxx | 16
framework/source/dispatch/dispatchprovider.cxx | 6
framework/source/dispatch/interceptionhelper.cxx | 8
framework/source/fwe/classes/addonsoptions.cxx | 2
framework/source/fwe/helper/titlehelper.cxx | 220 +++++++------
framework/source/helper/oframes.cxx | 4
framework/source/jobs/helponstartup.cxx | 4
framework/source/jobs/job.cxx | 2
framework/source/jobs/jobexecutor.cxx | 31 -
framework/source/jobs/joburl.cxx | 6
framework/source/jobs/shelljob.cxx | 6
framework/source/layoutmanager/helpers.cxx | 10
framework/source/layoutmanager/layoutmanager.cxx | 10
framework/source/layoutmanager/toolbarlayoutmanager.cxx | 2
framework/source/loadenv/loadenv.cxx | 4
framework/source/services/autorecovery.cxx | 4
framework/source/services/frame.cxx | 8
framework/source/services/pathsettings.cxx | 12
framework/source/tabwin/tabwindow.cxx | 2
framework/source/uielement/controlmenucontroller.cxx | 2
framework/source/uielement/progressbarwrapper.cxx | 4
46 files changed, 325 insertions(+), 302 deletions(-)
New commits:
commit cfadf87cf51e0681d5fc4059a973ed1630a8203f
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Feb 8 13:16:30 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Feb 9 17:07:24 2019 +0100
loplugin:indentation in framework
Change-Id: I9d0ef502eb812499b0372436083f673bb19ff578
Reviewed-on: https://gerrit.libreoffice.org/67557
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index 37baeba37364..559be7efbb1b 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -864,7 +864,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::setStorage(const css::uno::Refer
sal_Bool SAL_CALL XCUBasedAcceleratorConfiguration::hasStorage()
{
SAL_INFO("fwk.accelerators", "XCUBasedAcceleratorConfiguration::hasStorage(): implement this HACK .-)");
- return false;
+ return false;
}
void SAL_CALL XCUBasedAcceleratorConfiguration::addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/)
@@ -918,8 +918,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util:
css::util::ChangesEvent aReceivedEvents( aEvent );
const sal_Int32 c = aReceivedEvents.Changes.getLength();
- sal_Int32 i = 0;
- for (i=0; i<c; ++i)
+ for (sal_Int32 i=0; i<c; ++i)
{
const css::util::ElementChange& aChange = aReceivedEvents.Changes[i];
diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx
index b5b309150fd6..2c0b96f78f02 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -447,13 +447,13 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType
}
// read content of level 3 (presets, targets)
- css::uno::Reference< css::container::XNameAccess > xAccess;
- css::uno::Sequence< OUString > lNames;
- const OUString* pNames;
- sal_Int32 c;
- sal_Int32 i;
- std::vector<OUString> lPresets;
- std::vector<OUString> lTargets;
+ css::uno::Reference< css::container::XNameAccess > xAccess;
+ css::uno::Sequence< OUString > lNames;
+ const OUString* pNames;
+ sal_Int32 c;
+ sal_Int32 i;
+ std::vector<OUString> lPresets;
+ std::vector<OUString> lTargets;
// read preset names of share layer
xAccess.set(xShare, css::uno::UNO_QUERY);
@@ -786,11 +786,11 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPat
if (!xAccess.is())
return ::std::vector< OUString >();
- ::std::vector< OUString > lSubFolders;
+ ::std::vector< OUString > lSubFolders;
const css::uno::Sequence< OUString > lNames = xAccess->getElementNames();
const OUString* pNames = lNames.getConstArray();
- sal_Int32 c = lNames.getLength();
- sal_Int32 i = 0;
+ sal_Int32 c = lNames.getLength();
+ sal_Int32 i = 0;
for (i=0; i<c; ++i)
{
diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx
index ea0b05cf99ec..1f4e98f41616 100644
--- a/framework/source/dispatch/dispatchinformationprovider.cxx
+++ b/framework/source/dispatch/dispatchinformationprovider.cxx
@@ -56,12 +56,12 @@ css::uno::Sequence< sal_Int16 > SAL_CALL DispatchInformationProvider::getSupport
continue;
const css::uno::Sequence< sal_Int16 > lProviderGroups = xProvider->getSupportedCommandGroups();
- sal_Int32 c2 = lProviderGroups.getLength();
- sal_Int32 i2 = 0;
+ sal_Int32 c2 = lProviderGroups.getLength();
+ sal_Int32 i2 = 0;
for (i2=0; i2<c2; ++i2)
{
- const sal_Int16& rGroup = lProviderGroups[i2];
- ::std::vector< sal_Int16 >::const_iterator pGroup =
+ const sal_Int16& rGroup = lProviderGroups[i2];
+ ::std::vector< sal_Int16 >::const_iterator pGroup =
::std::find(lGroups.begin(), lGroups.end(), rGroup);
if (pGroup == lGroups.end())
lGroups.push_back(rGroup);
@@ -89,12 +89,12 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL DispatchInformati
continue;
const css::uno::Sequence< css::frame::DispatchInformation > lProviderInfos = xProvider->getConfigurableDispatchInformation(nCommandGroup);
- sal_Int32 c2 = lProviderInfos.getLength();
- sal_Int32 i2 = 0;
+ sal_Int32 c2 = lProviderInfos.getLength();
+ sal_Int32 i2 = 0;
for (i2=0; i2<c2; ++i2)
{
- const css::frame::DispatchInformation& rInfo = lProviderInfos[i2];
- auto pInfo = lInfos.find(rInfo.Command);
+ const css::frame::DispatchInformation& rInfo = lProviderInfos[i2];
+ auto pInfo = lInfos.find(rInfo.Command);
if (pInfo == lInfos.end())
lInfos[rInfo.Command] = rInfo;
}
diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx
index 7e7bb405ea43..480953f0cb3c 100644
--- a/framework/source/dispatch/dispatchprovider.cxx
+++ b/framework/source/dispatch/dispatchprovider.cxx
@@ -217,8 +217,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt
else
{
- sal_Int32 nRightFlags = nSearchFlags;
- nRightFlags &= ~css::frame::FrameSearchFlag::CREATE;
+ sal_Int32 nRightFlags = nSearchFlags & ~css::frame::FrameSearchFlag::CREATE;
// try to find any existing target and ask him for his dispatcher
css::uno::Reference< css::frame::XFrame > xFoundFrame = xDesktop->findFrame(sTargetFrameName, nRightFlags);
@@ -385,8 +384,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
else
{
- sal_Int32 nRightFlags = nSearchFlags;
- nRightFlags &= ~css::frame::FrameSearchFlag::CREATE;
+ sal_Int32 nRightFlags = nSearchFlags & ~css::frame::FrameSearchFlag::CREATE;
// try to find any existing target and ask him for his dispatcher
css::uno::Reference< css::frame::XFrame > xFoundFrame = xFrame->findFrame(sTargetFrameName, nRightFlags);
diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx
index 32378f2283a5..9a98285ec720 100644
--- a/framework/source/dispatch/interceptionhelper.cxx
+++ b/framework/source/dispatch/interceptionhelper.cxx
@@ -84,10 +84,10 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL InterceptionHelper::queryD
css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL InterceptionHelper::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor )
{
- sal_Int32 c = lDescriptor.getLength();
- css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > lDispatches (c);
- css::uno::Reference< css::frame::XDispatch >* pDispatches = lDispatches.getArray();
- const css::frame::DispatchDescriptor* pDescriptor = lDescriptor.getConstArray();
+ sal_Int32 c = lDescriptor.getLength();
+ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > lDispatches (c);
+ css::uno::Reference< css::frame::XDispatch >* pDispatches = lDispatches.getArray();
+ const css::frame::DispatchDescriptor* pDescriptor = lDescriptor.getConstArray();
for (sal_Int32 i=0; i<c; ++i)
pDispatches[i] = queryDispatch(pDescriptor[i].FeatureURL, pDescriptor[i].FrameName, pDescriptor[i].SearchFlags);
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index 2c6f33bef492..4131a4381736 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -1101,7 +1101,7 @@ bool AddonsOptions_Impl::ReadMenuItem( const OUString& aMenuNodeName, Sequence<
OUString aMenuImageId;
aMenuItemNodePropValues[ OFFSET_MENUITEM_IMAGEIDENTIFIER ] >>= aMenuImageId;
- ReadAndAssociateImages( aStrValue, aMenuImageId );
+ ReadAndAssociateImages( aStrValue, aMenuImageId );
aMenuItem[ OFFSET_MENUITEM_URL ].Value <<= aStrValue;
aMenuItem[ OFFSET_MENUITEM_TARGET ].Value = aMenuItemNodePropValues[ OFFSET_MENUITEM_TARGET ];
diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx
index 36141cfba0f1..070ec79bdfe0 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -67,11 +67,11 @@ TitleHelper::~TitleHelper()
void TitleHelper::setOwner(const css::uno::Reference< css::uno::XInterface >& xOwner)
{
// SYNCHRONIZED ->
- ::osl::ResettableMutexGuard aLock(m_aMutex);
+ {
+ ::osl::ResettableMutexGuard aLock(m_aMutex);
m_xOwner = xOwner;
-
- aLock.clear ();
+ }
// <- SYNCHRONIZED
css::uno::Reference< css::frame::XModel > xModel(xOwner, css::uno::UNO_QUERY);
@@ -101,21 +101,20 @@ OUString SAL_CALL TitleHelper::getTitle()
// SYNCHRONIZED ->
::osl::ResettableMutexGuard aLock(m_aMutex);
- // An external title will win always and disable all internal logic about
- // creating/using a title value.
- // Even an empty string will be accepted as valid title !
- if (m_bExternalTitle)
- return m_sTitle;
-
- // Title seems to be up-to-date. Return it directly.
- if (!m_sTitle.isEmpty())
- return m_sTitle;
-
- // Title seems to be unused till now ... do bootstraping
- impl_updateTitle (true);
+ // An external title will win always and disable all internal logic about
+ // creating/using a title value.
+ // Even an empty string will be accepted as valid title !
+ if (m_bExternalTitle)
+ return m_sTitle;
+ // Title seems to be up-to-date. Return it directly.
+ if (!m_sTitle.isEmpty())
return m_sTitle;
+ // Title seems to be unused till now ... do bootstraping
+ impl_updateTitle (true);
+
+ return m_sTitle;
// <- SYNCHRONIZED
}
@@ -124,20 +123,19 @@ void TitleHelper::connectWithUntitledNumbers (const css::uno::Reference< css::fr
// SYNCHRONIZED ->
::osl::ResettableMutexGuard aLock(m_aMutex);
- m_xUntitledNumbers = xNumbers;
-
+ m_xUntitledNumbers = xNumbers;
// <- SYNCHRONIZED
}
void SAL_CALL TitleHelper::setTitle(const OUString& sTitle)
{
// SYNCHRONIZED ->
- ::osl::ResettableMutexGuard aLock(m_aMutex);
+ {
+ ::osl::ResettableMutexGuard aLock(m_aMutex);
m_bExternalTitle = true;
m_sTitle = sTitle;
-
- aLock.clear ();
+ }
// <- SYNCHRONIZED
impl_sendTitleChangedEvent ();
@@ -157,12 +155,13 @@ void SAL_CALL TitleHelper::removeTitleChangeListener(const css::uno::Reference<
void SAL_CALL TitleHelper::titleChanged(const css::frame::TitleChangedEvent& aEvent)
{
+ css::uno::Reference< css::frame::XTitle > xSubTitle;
// SYNCHRONIZED ->
- ::osl::ResettableMutexGuard aLock(m_aMutex);
-
- css::uno::Reference< css::frame::XTitle > xSubTitle(m_xSubTitle.get (), css::uno::UNO_QUERY);
+ {
+ ::osl::ResettableMutexGuard aLock(m_aMutex);
- aLock.clear ();
+ xSubTitle.set(m_xSubTitle.get (), css::uno::UNO_QUERY);
+ }
// <- SYNCHRONIZED
if (aEvent.Source != xSubTitle)
@@ -178,12 +177,13 @@ void SAL_CALL TitleHelper::documentEventOccured(const css::document::DocumentEve
&& ! aEvent.EventName.equalsIgnoreAsciiCase("OnTitleChanged"))
return;
+ css::uno::Reference< css::frame::XModel > xOwner;
// SYNCHRONIZED ->
- ::osl::ResettableMutexGuard aLock(m_aMutex);
-
- css::uno::Reference< css::frame::XModel > xOwner(m_xOwner.get (), css::uno::UNO_QUERY);
+ {
+ ::osl::ResettableMutexGuard aLock(m_aMutex);
- aLock.clear ();
+ xOwner.set(m_xOwner.get (), css::uno::UNO_QUERY);
+ }
// <- SYNCHRONIZED
if (aEvent.Source != xOwner
@@ -199,12 +199,13 @@ void SAL_CALL TitleHelper::documentEventOccured(const css::document::DocumentEve
void SAL_CALL TitleHelper::frameAction(const css::frame::FrameActionEvent& aEvent)
{
+ css::uno::Reference< css::frame::XFrame > xOwner;
// SYNCHRONIZED ->
- ::osl::ResettableMutexGuard aLock(m_aMutex);
-
- css::uno::Reference< css::frame::XFrame > xOwner(m_xOwner.get (), css::uno::UNO_QUERY);
+ {
+ ::osl::ResettableMutexGuard aLock(m_aMutex);
- aLock.clear ();
+ xOwner.set(m_xOwner.get (), css::uno::UNO_QUERY);
+ }
// <- SYNCHRONIZED
if (aEvent.Source != xOwner)
@@ -225,12 +226,17 @@ void SAL_CALL TitleHelper::frameAction(const css::frame::FrameActionEvent& aEven
void SAL_CALL TitleHelper::disposing(const css::lang::EventObject& aEvent)
{
+ css::uno::Reference< css::uno::XInterface > xOwner;
+ css::uno::Reference< css::frame::XUntitledNumbers > xNumbers;
+ ::sal_Int32 nLeasedNumber;
// SYNCHRONIZED ->
- ::osl::ResettableMutexGuard aLock(m_aMutex);
- css::uno::Reference< css::uno::XInterface > xOwner (m_xOwner.get() , css::uno::UNO_QUERY);
- css::uno::Reference< css::frame::XUntitledNumbers > xNumbers (m_xUntitledNumbers.get(), css::uno::UNO_QUERY);
- ::sal_Int32 nLeasedNumber = m_nLeasedNumber;
- aLock.clear ();
+ {
+ ::osl::ResettableMutexGuard aLock(m_aMutex);
+
+ xOwner.set(m_xOwner.get() , css::uno::UNO_QUERY);
+ xNumbers.set(m_xUntitledNumbers.get(), css::uno::UNO_QUERY);
+ nLeasedNumber = m_nLeasedNumber;
+ }
// <- SYNCHRONIZED
if ( ! xOwner.is ())
@@ -246,27 +252,29 @@ void SAL_CALL TitleHelper::disposing(const css::lang::EventObject& aEvent)
xNumbers->releaseNumber (nLeasedNumber);
// SYNCHRONIZED ->
- aLock.reset ();
-
- m_xOwner = nullptr;
- m_sTitle = OUString ();
- m_nLeasedNumber = css::frame::UntitledNumbersConst::INVALID_NUMBER;
+ {
+ ::osl::ResettableMutexGuard aLock(m_aMutex);
- aLock.clear ();
+ m_xOwner = nullptr;
+ m_sTitle = OUString ();
+ m_nLeasedNumber = css::frame::UntitledNumbersConst::INVALID_NUMBER;
+ }
// <- SYNCHRONIZED
-
}
void TitleHelper::impl_sendTitleChangedEvent ()
{
+ css::uno::Reference<css::uno::XInterface> xOwner;
// SYNCHRONIZED ->
- ::osl::ResettableMutexGuard aLock(m_aMutex);
-
- css::frame::TitleChangedEvent aEvent(m_xOwner.get (), m_sTitle);
+ {
+ ::osl::ResettableMutexGuard aLock(m_aMutex);
- aLock.clear ();
+ xOwner = m_xOwner;
+ }
// <- SYNCHRONIZED
+ css::frame::TitleChangedEvent aEvent(xOwner, m_sTitle);
+
if( ! aEvent.Source.is() )
return;
@@ -290,14 +298,17 @@ void TitleHelper::impl_sendTitleChangedEvent ()
void TitleHelper::impl_updateTitle (bool init)
{
+ css::uno::Reference< css::frame::XModel > xModel;
+ css::uno::Reference< css::frame::XController > xController;
+ css::uno::Reference< css::frame::XFrame > xFrame;
// SYNCHRONIZED ->
- ::osl::ResettableMutexGuard aLock(m_aMutex);
-
- css::uno::Reference< css::frame::XModel > xModel (m_xOwner.get(), css::uno::UNO_QUERY);
- css::uno::Reference< css::frame::XController > xController(m_xOwner.get(), css::uno::UNO_QUERY);
- css::uno::Reference< css::frame::XFrame > xFrame (m_xOwner.get(), css::uno::UNO_QUERY);
+ {
+ ::osl::ResettableMutexGuard aLock(m_aMutex);
- aLock.clear ();
+ xModel.set (m_xOwner.get(), css::uno::UNO_QUERY);
+ xController.set(m_xOwner.get(), css::uno::UNO_QUERY);
+ xFrame.set (m_xOwner.get(), css::uno::UNO_QUERY);
+ }
// <- SYNCHRONIZED
if (xModel.is ())
@@ -316,19 +327,22 @@ void TitleHelper::impl_updateTitle (bool init)
void TitleHelper::impl_updateTitleForModel (const css::uno::Reference< css::frame::XModel >& xModel, bool init)
{
+ css::uno::Reference< css::uno::XInterface > xOwner;
+ css::uno::Reference< css::frame::XUntitledNumbers > xNumbers;
+ ::sal_Int32 nLeasedNumber;
// SYNCHRONIZED ->
- ::osl::ResettableMutexGuard aLock(m_aMutex);
+ {
+ ::osl::ResettableMutexGuard aLock(m_aMutex);
// external title won't be updated internally!
// It has to be set from outside new.
if (m_bExternalTitle)
return;
- css::uno::Reference< css::uno::XInterface > xOwner (m_xOwner.get() , css::uno::UNO_QUERY);
- css::uno::Reference< css::frame::XUntitledNumbers > xNumbers (m_xUntitledNumbers.get(), css::uno::UNO_QUERY);
- ::sal_Int32 nLeasedNumber = m_nLeasedNumber;
-
- aLock.clear ();
+ xOwner.set (m_xOwner.get() , css::uno::UNO_QUERY);
+ xNumbers.set (m_xUntitledNumbers.get(), css::uno::UNO_QUERY);
+ nLeasedNumber = m_nLeasedNumber;
+ }
// <- SYNCHRONIZED
if (
@@ -376,17 +390,18 @@ void TitleHelper::impl_updateTitleForModel (const css::uno::Reference< css::fram
sTitle = sNewTitle.makeStringAndClear ();
}
+ bool bChanged;
// SYNCHRONIZED ->
- aLock.reset ();
-
- // WORKAROUND: the notification is currently sent always,
- // can be changed after shared mode is supported per UNO API
- bool bChanged = !init; // && m_sTitle != sTitle
+ {
+ ::osl::ResettableMutexGuard aLock(m_aMutex);
- m_sTitle = sTitle;
- m_nLeasedNumber = nLeasedNumber;
+ // WORKAROUND: the notification is currently sent always,
+ // can be changed after shared mode is supported per UNO API
+ bChanged = !init; // && m_sTitle != sTitle
- aLock.clear ();
+ m_sTitle = sTitle;
+ m_nLeasedNumber = nLeasedNumber;
+ }
// <- SYNCHRONIZED
if (bChanged)
@@ -395,19 +410,22 @@ void TitleHelper::impl_updateTitleForModel (const css::uno::Reference< css::fram
void TitleHelper::impl_updateTitleForController (const css::uno::Reference< css::frame::XController >& xController, bool init)
{
+ css::uno::Reference< css::uno::XInterface > xOwner;
+ css::uno::Reference< css::frame::XUntitledNumbers > xNumbers;
+ ::sal_Int32 nLeasedNumber;
// SYNCHRONIZED ->
- ::osl::ResettableMutexGuard aLock(m_aMutex);
+ {
+ ::osl::ResettableMutexGuard aLock(m_aMutex);
// external title won't be updated internally!
// It has to be set from outside new.
if (m_bExternalTitle)
return;
- css::uno::Reference< css::uno::XInterface > xOwner (m_xOwner.get() , css::uno::UNO_QUERY);
- css::uno::Reference< css::frame::XUntitledNumbers > xNumbers (m_xUntitledNumbers.get(), css::uno::UNO_QUERY);
- ::sal_Int32 nLeasedNumber = m_nLeasedNumber;
-
- aLock.clear ();
+ xOwner.set (m_xOwner.get() , css::uno::UNO_QUERY);
+ xNumbers.set (m_xUntitledNumbers.get(), css::uno::UNO_QUERY);
+ nLeasedNumber = m_nLeasedNumber;
+ }
// <- SYNCHRONIZED
if (
@@ -454,15 +472,16 @@ void TitleHelper::impl_updateTitleForController (const css::uno::Reference< css:
}
}
+ bool bChanged;
// SYNCHRONIZED ->
- aLock.reset ();
+ {
+ ::osl::ResettableMutexGuard aLock(m_aMutex);
OUString sNewTitle = sTitle.makeStringAndClear ();
- bool bChanged = !init && m_sTitle != sNewTitle;
- m_sTitle = sNewTitle;
- m_nLeasedNumber = nLeasedNumber;
-
- aLock.clear ();
+ bChanged = !init && m_sTitle != sNewTitle;
+ m_sTitle = sNewTitle;
+ m_nLeasedNumber = nLeasedNumber;
+ }
// <- SYNCHRONIZED
if (bChanged)
@@ -475,14 +494,14 @@ void TitleHelper::impl_updateTitleForFrame (const css::uno::Reference< css::fram
return;
// SYNCHRONIZED ->
- ::osl::ResettableMutexGuard aLock(m_aMutex);
+ {
+ ::osl::ResettableMutexGuard aLock(m_aMutex);
// external title won't be updated internally!
// It has to be set from outside new.
if (m_bExternalTitle)
return;
-
- aLock.clear ();
+ }
// <- SYNCHRONIZED
css::uno::Reference< css::uno::XInterface > xComponent;
@@ -501,14 +520,16 @@ void TitleHelper::impl_updateTitleForFrame (const css::uno::Reference< css::fram
impl_appendDebugVersion (sTitle);
#endif
impl_appendSafeMode (sTitle);
+
+ bool bChanged;
// SYNCHRONIZED ->
- aLock.reset ();
+ {
+ ::osl::ResettableMutexGuard aLock(m_aMutex);
OUString sNewTitle = sTitle.makeStringAndClear ();
- bool bChanged = !init && m_sTitle != sNewTitle;
- m_sTitle = sNewTitle;
-
- aLock.clear ();
+ bChanged = !init && m_sTitle != sNewTitle;
+ m_sTitle = sNewTitle;
+ }
// <- SYNCHRONIZED
if (bChanged)
@@ -538,13 +559,15 @@ void TitleHelper::impl_appendProductName (OUStringBuffer& sTitle)
void TitleHelper::impl_appendModuleName (OUStringBuffer& sTitle)
{
+ css::uno::Reference< css::uno::XInterface > xOwner;
+ css::uno::Reference< css::uno::XComponentContext > xContext;
// SYNCHRONIZED ->
- ::osl::ResettableMutexGuard aLock(m_aMutex);
-
- css::uno::Reference< css::uno::XInterface > xOwner = m_xOwner.get();
- css::uno::Reference< css::uno::XComponentContext > xContext = m_xContext;
+ {
+ ::osl::ResettableMutexGuard aLock(m_aMutex);
- aLock.clear ();
+ xOwner = m_xOwner.get();
+ xContext = m_xContext;
+ }
// <- SYNCHRONIZED
try
@@ -553,7 +576,7 @@ void TitleHelper::impl_appendModuleName (OUStringBuffer& sTitle)
css::frame::ModuleManager::create(xContext);
const OUString sID = xModuleManager->identify(xOwner);
- ::comphelper::SequenceAsHashMap lProps = xModuleManager->getByName (sID);
+ ::comphelper::SequenceAsHashMap lProps = xModuleManager->getByName (sID);
const OUString sUIName = lProps.getUnpackedValueOrDefault (OFFICEFACTORY_PROPNAME_ASCII_UINAME, OUString());
// An UIname property is an optional value !
@@ -625,17 +648,18 @@ void TitleHelper::impl_updateListeningForFrame (const css::uno::Reference< css::
void TitleHelper::impl_setSubTitle (const css::uno::Reference< css::frame::XTitle >& xSubTitle)
{
+ css::uno::Reference< css::frame::XTitle > xOldSubTitle;
// SYNCHRONIZED ->
- ::osl::ResettableMutexGuard aLock(m_aMutex);
+ {
+ ::osl::ResettableMutexGuard aLock(m_aMutex);
// ignore duplicate calls. Makes outside using of this helper more easy :-)
- css::uno::Reference< css::frame::XTitle > xOldSubTitle(m_xSubTitle.get(), css::uno::UNO_QUERY);
+ xOldSubTitle.set(m_xSubTitle.get(), css::uno::UNO_QUERY);
if (xOldSubTitle == xSubTitle)
return;
m_xSubTitle = xSubTitle;
-
- aLock.clear ();
+ }
// <- SYNCHRONIZED
css::uno::Reference< css::frame::XTitleChangeBroadcaster > xOldBroadcaster(xOldSubTitle , css::uno::UNO_QUERY );
diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx
index 0b59f89ac8d3..1425325f7673 100644
--- a/framework/source/helper/oframes.cxx
+++ b/framework/source/helper/oframes.cxx
@@ -228,8 +228,8 @@ Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex )
{
SolarMutexGuard g;
- sal_uInt32 nCount = m_pFrameContainer->getCount();
- if ( nIndex < 0 || ( sal::static_int_cast< sal_uInt32 >( nIndex ) >= nCount ))
+ sal_uInt32 nCount = m_pFrameContainer->getCount();
+ if ( nIndex < 0 || ( sal::static_int_cast< sal_uInt32 >( nIndex ) >= nCount ))
throw IndexOutOfBoundsException("OFrames::getByIndex - Index out of bounds",
static_cast<OWeakObject *>(this) );
diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx
index 67f670f31e3e..c318bad1a660 100644
--- a/framework/source/jobs/helponstartup.cxx
+++ b/framework/source/jobs/helponstartup.cxx
@@ -267,8 +267,8 @@ bool HelpOnStartup::its_isHelpUrlADefaultOne(const OUString& sHelpURL)
// check given help url against all default ones
const css::uno::Sequence< OUString > lModules = xConfig->getElementNames();
const OUString* pModules = lModules.getConstArray();
- ::sal_Int32 c = lModules.getLength();
- ::sal_Int32 i = 0;
+ ::sal_Int32 c = lModules.getLength();
+ ::sal_Int32 i = 0;
for (i=0; i<c; ++i)
{
diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx
index d1afa95b61b9..574765ad3d22 100644
--- a/framework/source/jobs/job.cxx
+++ b/framework/source/jobs/job.cxx
@@ -466,7 +466,7 @@ void Job::impl_reactForJobResult( /*IN*/ const css::uno::Any& aResult )
// and we nor the job are the right ones ...
// our user has set itself before. So we can fake this source address!
css::frame::DispatchResultEvent aEvent = aAnalyzedResult.getDispatchResult();
- aEvent.Source = m_xResultSourceFake;
+ aEvent.Source = m_xResultSourceFake;
m_xResultListener->dispatchFinished(aEvent);
}
}
diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx
index 23db4f21fe5f..6e54d7375f43 100644
--- a/framework/source/jobs/jobexecutor.cxx
+++ b/framework/source/jobs/jobexecutor.cxx
@@ -224,23 +224,24 @@ void SAL_CALL JobExecutor::trigger( const OUString& sEvent )
{
rtl::Reference<Job> pJob;
- /* SAFE */ {
- SolarMutexGuard g2;
-
- JobData aCfg(m_xContext);
- aCfg.setEvent(sEvent, lJobs[j]);
- aCfg.setEnvironment(JobData::E_EXECUTION);
-
- /*Attention!
- Jobs implements interfaces and dies by ref count!
- And freeing of such uno object is done by uno itself.
- So we have to use dynamic memory everytimes.
- */
- pJob = new Job(m_xContext, css::uno::Reference< css::frame::XFrame >());
- pJob->setJobData(aCfg);
+ /* SAFE */
+ {
+ SolarMutexGuard g2;
+
+ JobData aCfg(m_xContext);
+ aCfg.setEvent(sEvent, lJobs[j]);
+ aCfg.setEnvironment(JobData::E_EXECUTION);
+
+ /*Attention!
+ Jobs implements interfaces and dies by ref count!
+ And freeing of such uno object is done by uno itself.
+ So we have to use dynamic memory everytimes.
+ */
+ pJob = new Job(m_xContext, css::uno::Reference< css::frame::XFrame >());
+ pJob->setJobData(aCfg);
} /* SAFE */
- pJob->execute(css::uno::Sequence< css::beans::NamedValue >());
+ pJob->execute(css::uno::Sequence< css::beans::NamedValue >());
}
}
diff --git a/framework/source/jobs/joburl.cxx b/framework/source/jobs/joburl.cxx
index 307f6c9cdc93..6cefd3119982 100644
--- a/framework/source/jobs/joburl.cxx
+++ b/framework/source/jobs/joburl.cxx
@@ -125,7 +125,7 @@ bool JobURL::getEvent( /*OUT*/ OUString& sEvent ) const
{
SolarMutexGuard g;
- sEvent.clear();
+ sEvent.clear();
bool bSet = ((m_eRequest & E_EVENT) == E_EVENT);
if (bSet)
sEvent = m_sEvent;
@@ -153,7 +153,7 @@ bool JobURL::getAlias( /*OUT*/ OUString& sAlias ) const
{
SolarMutexGuard g;
- sAlias.clear();
+ sAlias.clear();
bool bSet = ((m_eRequest & E_ALIAS) == E_ALIAS);
if (bSet)
sAlias = m_sAlias;
@@ -181,7 +181,7 @@ bool JobURL::getService( /*OUT*/ OUString& sService ) const
{
SolarMutexGuard g;
- sService.clear();
+ sService.clear();
bool bSet = ((m_eRequest & E_SERVICE) == E_SERVICE);
if (bSet)
sService = m_sService;
diff --git a/framework/source/jobs/shelljob.cxx b/framework/source/jobs/shelljob.cxx
index e9df9737a615..a83949437517 100644
--- a/framework/source/jobs/shelljob.cxx
+++ b/framework/source/jobs/shelljob.cxx
@@ -124,9 +124,9 @@ bool ShellJob::impl_execute(const OUString& sCommand
const css::uno::Sequence< OUString >& lArguments ,
bool bCheckExitCode)
{
- ::rtl_uString** pArgs = nullptr;
- const ::sal_Int32 nArgs = lArguments.getLength ();
- oslProcess hProcess(nullptr);
+ ::rtl_uString** pArgs = nullptr;
+ const ::sal_Int32 nArgs = lArguments.getLength ();
+ oslProcess hProcess(nullptr);
if (nArgs > 0)
pArgs = reinterpret_cast< ::rtl_uString** >(const_cast< OUString* >(lArguments.getConstArray()));
diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx
index 2227dd2a1e60..a5e4762f2e8b 100644
--- a/framework/source/layoutmanager/helpers.cxx
+++ b/framework/source/layoutmanager/helpers.cxx
@@ -256,12 +256,12 @@ uno::Reference< frame::XModel > impl_getModelFromFrame( const uno::Reference< fr
{
// Query for the model to get check the context information
uno::Reference< frame::XModel > xModel;
- if ( rFrame.is() )
- {
+ if ( rFrame.is() )
+ {
uno::Reference< frame::XController > xController( rFrame->getController(), uno::UNO_QUERY );
- if ( xController.is() )
- xModel = xController->getModel();
- }
+ if ( xController.is() )
+ xModel = xController->getModel();
+ }
return xModel;
}
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index a746715366bf..749562d29245 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -2864,11 +2864,11 @@ void SAL_CALL LayoutManager::elementRemoved( const ui::ConfigurationEvent& Event
if ( xFrame.is() )
{
- OUString aElementType;
- OUString aElementName;
- bool bRefreshLayout(false);
+ OUString aElementType;
+ OUString aElementName;
+ bool bRefreshLayout(false);
- parseResourceURL( Event.ResourceURL, aElementType, aElementName );
+ parseResourceURL( Event.ResourceURL, aElementType, aElementName );
if ( aElementType.equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ))
{
if ( xToolbarManager.is() )
@@ -2913,7 +2913,7 @@ void SAL_CALL LayoutManager::elementRemoved( const ui::ConfigurationEvent& Event
}
// No settings anymore, element must be destroyed
- if ( xContainerWindow.is() && bNoSettings )
+ if ( xContainerWindow.is() && bNoSettings )
{
if ( aElementType.equalsIgnoreAsciiCase("menubar") &&
aElementName.equalsIgnoreAsciiCase("menubar") )
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 40e88154d7e3..6380c4ae86ee 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -4075,7 +4075,7 @@ awt::Point ToolbarLayoutManager::getToolbarPos( const OUString& rResourceURL )
void ToolbarLayoutManager::setToolbarSize( const OUString& rResourceURL, const awt::Size& aSize )
{
- uno::Reference< awt::XWindow2 > xWindow( implts_getXWindow( rResourceURL ), uno::UNO_QUERY );
+ uno::Reference< awt::XWindow2 > xWindow( implts_getXWindow( rResourceURL ), uno::UNO_QUERY );
uno::Reference< awt::XDockableWindow > xDockWindow( xWindow, uno::UNO_QUERY );
UIElement aUIElement = implts_findToolbar( rResourceURL );
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index dc05a51ac6d3..0be9ad70e82e 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -816,7 +816,7 @@ void LoadEnv::impl_detectTypeAndFilter()
{
::comphelper::SequenceAsHashMap lFilterProps(xFilterCont->getByName(sFilter));
sal_Int32 nFlags = lFilterProps.getUnpackedValueOrDefault("Flags", sal_Int32(0));
- bIsOwnTemplate = ((nFlags & FILTERFLAG_TEMPLATEPATH) == FILTERFLAG_TEMPLATEPATH);
+ bIsOwnTemplate = ((nFlags & FILTERFLAG_TEMPLATEPATH) == FILTERFLAG_TEMPLATEPATH);
}
catch(const css::container::NoSuchElementException&)
{}
@@ -933,7 +933,7 @@ bool LoadEnv::impl_furtherDocsAllowed()
FrameAnalyzerFlags::Hidden);
sal_Int32 nOpenDocuments = aAnalyzer.m_lOtherVisibleFrames.size();
- bAllowed = (nOpenDocuments < nMaxOpenDocuments);
+ bAllowed = (nOpenDocuments < nMaxOpenDocuments);
}
}
catch(const css::uno::Exception&)
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 568c6ba0e6f6..60f4762146d5 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -1801,8 +1801,8 @@ void AutoRecovery::implts_readConfig()
const OUString sRECOVERY_ITEM_BASE_IDENTIFIER(RECOVERY_ITEM_BASE_IDENTIFIER);
const css::uno::Sequence< OUString > lItems = xRecoveryList->getElementNames();
const OUString* pItems = lItems.getConstArray();
- sal_Int32 c = lItems.getLength();
- sal_Int32 i = 0;
+ sal_Int32 c = lItems.getLength();
+ sal_Int32 i = 0;
// REENTRANT -> --------------------------
aCacheLock.lock(LOCK_FOR_CACHE_ADD_REMOVE);
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index b638a1130752..3d1e844e9516 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -868,9 +868,10 @@ void SAL_CALL XFrameImpl::setCreator( const css::uno::Reference< css::frame::XFr
checkDisposed();
/* SAFE { */
+ {
SolarMutexClearableGuard aWriteLock;
- m_xParent = xCreator;
- aWriteLock.clear();
+ m_xParent = xCreator;
+ }
/* } SAFE */
css::uno::Reference< css::frame::XDesktop > xIsDesktop( xCreator, css::uno::UNO_QUERY );
@@ -1172,8 +1173,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL XFrameImpl::findFrame( const
xTarget = xParent;
else
{
- sal_Int32 nRightFlags = nSearchFlags;
- nRightFlags &= ~css::frame::FrameSearchFlag::CHILDREN;
+ sal_Int32 nRightFlags = nSearchFlags & ~css::frame::FrameSearchFlag::CHILDREN;
xTarget = xParent->findFrame(sTargetFrameName, nRightFlags);
}
}
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index fe422707e3dd..070d62a6752b 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -1055,7 +1055,7 @@ void PathSettings::impl_rebuildPropertyDescriptor()
for (auto const& path : m_lPaths)
{
const PathSettings::PathInfo& rPath = path.second;
- css::beans::Property* pProp = nullptr;
+ css::beans::Property* pProp = nullptr;
pProp = &(m_lPropDesc[i]);
pProp->Name = rPath.sPathName;
@@ -1284,8 +1284,8 @@ PathSettings::PathInfo* PathSettings::impl_getPathAccess(sal_Int32 nHandle)
return nullptr;
const css::beans::Property& rProp = m_lPropDesc[nHandle];
- OUString sProp = impl_extractBaseFromPropName(rProp.Name);
- PathSettings::PathHash::iterator rPath = m_lPaths.find(sProp);
+ OUString sProp = impl_extractBaseFromPropName(rProp.Name);
+ PathSettings::PathHash::iterator rPath = m_lPaths.find(sProp);
if (rPath != m_lPaths.end())
return &(rPath->second);
@@ -1302,9 +1302,9 @@ const PathSettings::PathInfo* PathSettings::impl_getPathAccessConst(sal_Int32 nH
if (nHandle > (m_lPropDesc.getLength()-1))
return nullptr;
- const css::beans::Property& rProp = m_lPropDesc[nHandle];
- OUString sProp = impl_extractBaseFromPropName(rProp.Name);
- PathSettings::PathHash::const_iterator rPath = m_lPaths.find(sProp);
+ const css::beans::Property& rProp = m_lPropDesc[nHandle];
+ OUString sProp = impl_extractBaseFromPropName(rProp.Name);
+ PathSettings::PathHash::const_iterator rPath = m_lPaths.find(sProp);
if (rPath != m_lPaths.end())
return &(rPath->second);
diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx
index 06b938db0410..4dd6bcc0bb0d 100644
--- a/framework/source/tabwin/tabwindow.cxx
+++ b/framework/source/tabwin/tabwindow.cxx
@@ -665,7 +665,7 @@ css::uno::Sequence< css::beans::NamedValue > SAL_CALL TabWindow::getTabProps( ::
throw css::lang::IndexOutOfBoundsException();
const OUString& aTitle = pTabControl->GetPageText( sal_uInt16( ID ));
- nPos = pTabControl->GetPagePos( sal_uInt16( ID ));
+ nPos = pTabControl->GetPagePos( sal_uInt16( ID ));
css::uno::Sequence< css::beans::NamedValue > aSeq
{
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index 8f7aba6c9d83..62b1dcf9047a 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -271,7 +271,7 @@ void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Eve
break;
}
- if ( MENU_ITEM_NOTFOUND == nPrevInConversion )
+ if ( MENU_ITEM_NOTFOUND == nPrevInConversion )
// none of the items which precede the nSID-slot in the source menu are present in our conversion menu
nPrevInConversion = sal::static_int_cast< sal_uInt16 >(-1); // put the item at the first position
diff --git a/framework/source/uielement/progressbarwrapper.cxx b/framework/source/uielement/progressbarwrapper.cxx
index c44a2ce6db99..76e2dda4c262 100644
--- a/framework/source/uielement/progressbarwrapper.cxx
+++ b/framework/source/uielement/progressbarwrapper.cxx
@@ -304,9 +304,9 @@ uno::Reference< uno::XInterface > SAL_CALL ProgressBarWrapper::getRealInterface(
uno::Reference< lang::XComponent >(
static_cast< cppu::OWeakObject* >( this ),
uno::UNO_QUERY ));
- xComp.set(static_cast< cppu::OWeakObject* >( pWrapper ),
+ xComp.set(static_cast< cppu::OWeakObject* >( pWrapper ),
uno::UNO_QUERY );
- m_xProgressBarIfacWrapper = xComp;
+ m_xProgressBarIfacWrapper = xComp;
}
return xComp;
commit 0019eac5e5c1e0a9f0a216da7ce56eb5bfff886b
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Feb 8 13:16:19 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Feb 9 17:07:19 2019 +0100
loplugin:indentation in forms..fpicker
Change-Id: If01379c43519cc1dbcf8dfaefde545fbe7e24fc2
Reviewed-on: https://gerrit.libreoffice.org/67556
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 1ab76f31f8ef..87bfa6c13bc8 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -1307,7 +1307,7 @@ void OBoundControlModel::suspendValueListening( )
OSL_PRECOND( !m_sValuePropertyName.isEmpty(), "OBoundControlModel::suspendValueListening: don't have a value property!" );
OSL_PRECOND( m_pAggPropMultiplexer, "OBoundControlModel::suspendValueListening: I *am* not listening!" );
-if ( m_pAggPropMultiplexer )
+ if ( m_pAggPropMultiplexer )
m_pAggPropMultiplexer->lock();
}
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index 4d66ec70ad9d..171387dbc026 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -627,8 +627,8 @@ void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
// Bring my Format (may be void) to a persistent Format.
// The Supplier together with the Key is already persistent, but that doesn't mean
// we have to save the Supplier (which would be quite some overhead)
- Reference<XNumberFormatsSupplier> xSupplier;
- Any aFmtKey;
+ Reference<XNumberFormatsSupplier> xSupplier;
+ Any aFmtKey;
bool bVoidKey = true;
if (m_xAggregateSet.is())
{
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index d232a9129310..6bfb2d3b829f 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -817,7 +817,7 @@ bool OImageControlControl::implInsertGraphics()
{
Graphic aGraphic;
aDialog.GetGraphic( aGraphic );
- xSet->setPropertyValue( PROPERTY_GRAPHIC, makeAny( aGraphic.GetXGraphic() ) );
+ xSet->setPropertyValue( PROPERTY_GRAPHIC, makeAny( aGraphic.GetXGraphic() ) );
}
else
xSet->setPropertyValue( PROPERTY_IMAGE_URL, makeAny( aDialog.GetPath() ) );
diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx
index 2f2a9bf13636..eefe6b5dc552 100644
--- a/forms/source/misc/InterfaceContainer.cxx
+++ b/forms/source/misc/InterfaceContainer.cxx
@@ -1196,10 +1196,10 @@ Sequence< ScriptEventDescriptor > SAL_CALL OInterfaceContainer::getScriptEvents(
if ( m_xEventAttacher.is() )
{
aReturn = m_xEventAttacher->getScriptEvents( nIndex );
- if ( lcl_hasVbaEvents( aReturn ) )
- {
- aReturn = lcl_stripVbaEvents( aReturn );
- }
+ if ( lcl_hasVbaEvents( aReturn ) )
+ {
+ aReturn = lcl_stripVbaEvents( aReturn );
+ }
}
return aReturn;
}
@@ -1287,7 +1287,7 @@ OFormComponents::~OFormComponents()
void OFormComponents::disposing()
{
OInterfaceContainer::disposing();
- ::cppu::OComponentHelper::disposing();
+ ::cppu::OComponentHelper::disposing();
m_xParent = nullptr;
}
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index a1a23de36db7..e5fc93325a0d 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -1016,7 +1016,7 @@ void SAL_CALL SvtFilePicker::initialize( const Sequence< Any >& _rArguments )
namedValue.Value >>= sStandardDir;
// Set the directory for the "back to the default dir" button
- if ( !sStandardDir.isEmpty() )
+ if ( !sStandardDir.isEmpty() )
{
m_aStandardDir = sStandardDir;
}
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx
index d6184e0a2906..c20b7460282f 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -783,7 +783,7 @@ IMPL_LINK_NOARG ( RemoteFilesDialog, AddServiceHdl, Button*, void )
m_bIsUpdated = true;
EnableControls();
- break;
+ break;
}
case RET_CANCEL :
default :
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 8048c46df294..8064dca1c8fe 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -1258,7 +1258,7 @@ IMPL_LINK_NOARG( SvtFileDialog, ConnectToServerPressed_Hdl, Button*, void )
PlacePtr newPlace = aDlg.GetPlace();
pImpl->_pPlaces->AppendPlace(newPlace);
- break;
+ break;
}
case RET_CANCEL :
default :
@@ -1373,7 +1373,7 @@ void SvtFileDialog::OpenMultiSelection_Impl()
void SvtFileDialog::UpdateControls( const OUString& rURL )
{
- pImpl->_pEdFileName->SetBaseURL( rURL );
+ pImpl->_pEdFileName->SetBaseURL( rURL );
INetURLObject aObj( rURL );
@@ -1940,7 +1940,7 @@ bool SvtFileDialog::PrepareExecute()
bool bFileToSelect = nFileNameLen != 0;
if ( bFileToSelect && aFileName[ nFileNameLen - 1 ] != '/' )
{
- OUString aDecodedName = aFolderURL.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DecodeMechanism::WithCharset );
+ OUString aDecodedName = aFolderURL.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DecodeMechanism::WithCharset );
pImpl->_pEdFileName->SetText( aDecodedName );
aFolderURL.removeSegment();
}
commit 9eed3b4a1830250cb686e386cbcbe68da0e7cb02
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Feb 8 13:15:58 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Feb 9 17:07:13 2019 +0100
loplugin:indentation in filter
Change-Id: If0574f34effb82bf718958692a44fd422b71abd4
Reviewed-on: https://gerrit.libreoffice.org/67555
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index 29fb682df360..5a1fba1ed651 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -1409,7 +1409,7 @@ void FilterCache::impl_loadSet(const css::uno::Reference< css::container::XNameA
// for mapping extensions to its types!
const OUString* pItems = lItems.getConstArray();
- sal_Int32 c = lItems.getLength();
+ sal_Int32 c = lItems.getLength();
for (sal_Int32 i=0; i<c; ++i)
{
CacheItemList::iterator pItem = pCache->find(pItems[i]);
@@ -1479,8 +1479,8 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe
const ::std::vector< OUString > lLocales(comphelper::sequenceToContainer< ::std::vector< OUString >>(
xUIName->getElementNames()));
- ::std::vector< OUString >::const_iterator pLocale ;
- ::comphelper::SequenceAsHashMap lUINames;
+ ::std::vector< OUString >::const_iterator pLocale ;
+ ::comphelper::SequenceAsHashMap lUINames;
for (auto const& locale : lLocales)
{
diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx
index 573be9782275..8e559f2de666 100644
--- a/filter/source/config/cache/filterfactory.cxx
+++ b/filter/source/config/cache/filterfactory.cxx
@@ -341,7 +341,7 @@ class stlcomp_removeIfMatchFlags
try
{
const CacheItem aFilter = m_pCache->getItem(FilterCache::E_FILTER, sFilter);
- sal_Int32 nFlags = aFilter.getUnpackedValueOrDefault(PROPNAME_FLAGS, (sal_Int32(0)));
+ sal_Int32 nFlags = aFilter.getUnpackedValueOrDefault(PROPNAME_FLAGS, (sal_Int32(0)));
bool bMatch = false;
if (m_bIFlags)
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx
index cd247a23e110..3092bd51155c 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -235,7 +235,7 @@ static bool RenderAsEMF(const sal_uInt8* pBuf, sal_uInt32 nBytesRead, Graphic &r
oslFileHandle pIn = nullptr;
oslFileHandle pOut = nullptr;
oslFileHandle pErr = nullptr;
- oslProcessError eErr = runProcessWithPathSearch(
+ oslProcessError eErr = runProcessWithPathSearch(
"pstoedit" EXESUFFIX,
args, SAL_N_ELEMENTS(args),
&aProcess, &pIn, &pOut, &pErr);
@@ -303,7 +303,7 @@ static bool RenderAsBMPThroughHelper(const sal_uInt8* pBuf, sal_uInt32 nBytesRea
oslFileHandle pIn = nullptr;
oslFileHandle pOut = nullptr;
oslFileHandle pErr = nullptr;
- oslProcessError eErr = runProcessWithPathSearch(rProgName,
+ oslProcessError eErr = runProcessWithPathSearch(rProgName,
pArgs, nArgs,
&aProcess, &pIn, &pOut, &pErr);
if (eErr!=osl_Process_E_None)
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx
index 61c6bde360ec..0ba1d5c19aaa 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -1663,7 +1663,8 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
}
break;
}
- case GOrdSClPth: { SAL_INFO("filter.os2met","GOrdSClPth");
+ case GOrdSClPth: {
+ SAL_INFO("filter.os2met","GOrdSClPth");
sal_uInt32 nID;
OSPath * p=pPathList;
pOS2MET->SeekRel(2);
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx
index 4b6e459dad14..722234d399e5 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -357,11 +357,11 @@ Point PictReader::ReadPoint()
pPict->ReadInt16( ny ).ReadInt16( nx );
- Point aPoint( static_cast<long>(nx) - aBoundingRect.Left(),
+ Point aPoint( static_cast<long>(nx) - aBoundingRect.Left(),
static_cast<long>(ny) - aBoundingRect.Top() );
- SAL_INFO("filter.pict", "ReadPoint: " << aPoint);
- return aPoint;
+ SAL_INFO("filter.pict", "ReadPoint: " << aPoint);
+ return aPoint;
}
Point PictReader::ReadDeltaH(Point aBase)
@@ -490,13 +490,13 @@ sal_uLong PictReader::ReadPixPattern(PictReader::Pattern &pattern)
pPict->ReadUInt16( nPatType );
if (nPatType==1) {
- pattern.read(*pPict);
+ pattern.read(*pPict);
nDataSize=ReadPixMapEtc(aBMP,false,true,nullptr,nullptr,false,false);
// CHANGEME: use average pixmap colors to update the pattern, ...
if (nDataSize!=0xffffffff) nDataSize+=10;
}
else if (nPatType==2) {
- pattern.read(*pPict);
+ pattern.read(*pPict);
// RGBColor
sal_uInt16 nR, nG, nB;
pPict->ReadUInt16( nR ).ReadUInt16( nG ).ReadUInt16( nB );
diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx
index 1e609a85d52d..c055b1c20925 100644
--- a/filter/source/graphicfilter/ipsd/ipsd.cxx
+++ b/filter/source/graphicfilter/ipsd/ipsd.cxx
@@ -641,8 +641,8 @@ bool PSDReader::ImplReadBody()
{
nX = 0;
nY++;
- if ( nY == mpFileHeader->nRows )
- break;
+ if ( nY == mpFileHeader->nRows )
+ break;
}
}
}
diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx
index 43b8195680bc..aac095bbe373 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -264,7 +264,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 );
aPropOpt.AddOpt( ESCHER_Prop_fNoFillHitTest, 0x100000 ); // no fill
aPropOpt.AddOpt( ESCHER_Prop_fNoLineDrawDash, 0x90000 ); // no linestyle
- SdrObject* pObj = GetSdrObjectFromXShape( rObj.GetShapeRef() );
+ SdrObject* pObj = GetSdrObjectFromXShape( rObj.GetShapeRef() );
if ( pObj )
{
tools::Rectangle aBound = pObj->GetCurrentBoundRect();
@@ -634,7 +634,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
mpEscherEx->OpenContainer( ESCHER_SpContainer );
addShape( ESCHER_ShpInst_PictureFrame, ShapeFlag::HaveShapeProperty | ShapeFlag::HaveAnchor );
- if ( aPropOpt.CreateGraphicProperties( rObj.mXPropSet, "Bitmap", false ) )
+ if ( aPropOpt.CreateGraphicProperties( rObj.mXPropSet, "Bitmap", false ) )
aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 );
}
else if ( rObj.GetType() == "drawing.Caption" )
diff --git a/filter/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx
index 5980a6689513..c64477f079d1 100644
--- a/filter/source/msfilter/msoleexp.cxx
+++ b/filter/source/msfilter/msoleexp.cxx
@@ -200,11 +200,11 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef const & rObj
aSeq[1].Name = "FilterName";
aSeq[1].Value <<= pExpFilter->GetName();
uno::Reference < frame::XStorable > xStor( rObj->getComponent(), uno::UNO_QUERY );
- try
- {
- xStor->storeToURL( "private:stream", aSeq );
- }
- catch( const uno::Exception& ) {} // #TODO really handle exceptions - interactionalhandler etc. ?
+ try
+ {
+ xStor->storeToURL( "private:stream", aSeq );
+ }
+ catch( const uno::Exception& ) {} // #TODO really handle exceptions - interactionalhandler etc. ?
tools::SvRef<SotStorage> xOLEStor = new SotStorage( pStream, true );
xOLEStor->CopyTo( &rDestStg );
diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx
index 2a89ae769cdc..8a264753e28c 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -383,7 +383,7 @@ MacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const OUString& Macro
}
catch( const uno::Exception& /*e*/) {}
- sSearchList.push_back( sThisProject ); // First Lib to search
+ sSearchList.push_back( sThisProject ); // First Lib to search
// service VBAProjectNameProvider not implemented
#if 0
@@ -758,7 +758,7 @@ void applyShortCutKeyBinding ( const uno::Reference< frame::XModel >& rxModel, c
MacroResolvedInfo aMacroInfo = resolveVBAMacro( pShell, aMacroName );
if( !aMacroInfo.mbFound )
throw uno::RuntimeException( "The procedure doesn't exist" );
- MacroName = aMacroInfo.msResolvedMacro;
+ MacroName = aMacroInfo.msResolvedMacro;
}
uno::Reference< ui::XUIConfigurationManagerSupplier > xCfgSupplier(rxModel, uno::UNO_QUERY_THROW);
uno::Reference< ui::XUIConfigurationManager > xCfgMgr = xCfgSupplier->getUIConfigurationManager();
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 02aa7f0a0d37..8321b494d598 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -1111,40 +1111,40 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, Svx
pTObj->SetMergedItem( SdrTextFitToSizeTypeItem(drawing::TextFitToSizeType_AUTOFIT) );
}
- if ( dynamic_cast<const SdrObjCustomShape* >(pTObj) == nullptr )
- {
- pTObj->SetMergedItem( makeSdrTextAutoGrowWidthItem( bAutoGrowWidth ) );
- pTObj->SetMergedItem( makeSdrTextAutoGrowHeightItem( bAutoGrowHeight ) );
- }
- else
- {
- pTObj->SetMergedItem( makeSdrTextWordWrapItem( bWordWrap ) );
- pTObj->SetMergedItem( makeSdrTextAutoGrowHeightItem( bFitShapeToText ) );
- }
+ if ( dynamic_cast<const SdrObjCustomShape* >(pTObj) == nullptr )
+ {
+ pTObj->SetMergedItem( makeSdrTextAutoGrowWidthItem( bAutoGrowWidth ) );
+ pTObj->SetMergedItem( makeSdrTextAutoGrowHeightItem( bAutoGrowHeight ) );
+ }
+ else
+ {
+ pTObj->SetMergedItem( makeSdrTextWordWrapItem( bWordWrap ) );
+ pTObj->SetMergedItem( makeSdrTextAutoGrowHeightItem( bFitShapeToText ) );
+ }
- pTObj->SetMergedItem( SdrTextVertAdjustItem( eTVA ) );
- pTObj->SetMergedItem( SdrTextHorzAdjustItem( eTHA ) );
+ pTObj->SetMergedItem( SdrTextVertAdjustItem( eTVA ) );
+ pTObj->SetMergedItem( SdrTextHorzAdjustItem( eTHA ) );
- if ( nMinFrameHeight < 0 )
- nMinFrameHeight = 0;
- if ( dynamic_cast<const SdrObjCustomShape* >(pTObj) == nullptr )
- pTObj->SetMergedItem( makeSdrTextMinFrameHeightItem( nMinFrameHeight ) );
+ if ( nMinFrameHeight < 0 )
+ nMinFrameHeight = 0;
+ if ( dynamic_cast<const SdrObjCustomShape* >(pTObj) == nullptr )
+ pTObj->SetMergedItem( makeSdrTextMinFrameHeightItem( nMinFrameHeight ) );
- if ( nMinFrameWidth < 0 )
- nMinFrameWidth = 0;
- if ( dynamic_cast<const SdrObjCustomShape* >(pTObj) == nullptr )
- pTObj->SetMergedItem( makeSdrTextMinFrameWidthItem( nMinFrameWidth ) );
+ if ( nMinFrameWidth < 0 )
+ nMinFrameWidth = 0;
+ if ( dynamic_cast<const SdrObjCustomShape* >(pTObj) == nullptr )
+ pTObj->SetMergedItem( makeSdrTextMinFrameWidthItem( nMinFrameWidth ) );
- // set margins at the borders of the textbox
- pTObj->SetMergedItem( makeSdrTextLeftDistItem( nTextLeft ) );
- pTObj->SetMergedItem( makeSdrTextRightDistItem( nTextRight ) );
- pTObj->SetMergedItem( makeSdrTextUpperDistItem( nTextTop ) );
- pTObj->SetMergedItem( makeSdrTextLowerDistItem( nTextBottom ) );
- pTObj->SetMergedItem( SdrTextFixedCellHeightItem( true ) );
+ // set margins at the borders of the textbox
+ pTObj->SetMergedItem( makeSdrTextLeftDistItem( nTextLeft ) );
+ pTObj->SetMergedItem( makeSdrTextRightDistItem( nTextRight ) );
+ pTObj->SetMergedItem( makeSdrTextUpperDistItem( nTextTop ) );
+ pTObj->SetMergedItem( makeSdrTextLowerDistItem( nTextBottom ) );
+ pTObj->SetMergedItem( SdrTextFixedCellHeightItem( true ) );
- if ( dynamic_cast<const SdrObjCustomShape* >(pTObj) == nullptr )
- pTObj->SetSnapRect( rTextRect );
- pTObj = ReadObjText( &aTextObj, pTObj, rData.pPage );
+ if ( dynamic_cast<const SdrObjCustomShape* >(pTObj) == nullptr )
+ pTObj->SetSnapRect( rTextRect );
+ pTObj = ReadObjText( &aTextObj, pTObj, rData.pPage );
if ( pTObj )
{
@@ -2993,7 +2993,7 @@ sal_uInt32 SdrPowerPointImport::GetMasterPageId( sal_uInt16 nPageNum, PptPageKin
PptSlidePersistList* pPageList = GetPageList( ePageKind );
if ( pPageList && nPageNum < pPageList->size() )
return (*pPageList)[ nPageNum ].aSlideAtom.nMasterId;
- return 0;
+ return 0;
}
sal_uInt32 SdrPowerPointImport::GetNotesPageId( sal_uInt16 nPageNum ) const
@@ -3001,7 +3001,7 @@ sal_uInt32 SdrPowerPointImport::GetNotesPageId( sal_uInt16 nPageNum ) const
PptSlidePersistList* pPageList=GetPageList( PPT_SLIDEPAGE );
if ( pPageList && nPageNum < pPageList->size() )
return (*pPageList)[ nPageNum ].aSlideAtom.nNotesId;
- return 0;
+ return 0;
}
bool SdrPowerPointImport::HasMasterPage( sal_uInt16 nPageNum, PptPageKind ePageKind ) const
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 2a1ed5169493..fa04227f18ce 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -1596,7 +1596,7 @@ void SVGFilter::implExportDrawPages( const std::vector< Reference< css::drawing:
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", "DummySlide" );
SvXMLElementExport aDummySlideElement( *mpSVGExport, XML_NAMESPACE_NONE, "g", true, true );
{
- SvXMLElementExport aGElement( *mpSVGExport, XML_NAMESPACE_NONE, "g", true, true );
+ SvXMLElementExport aGElement( *mpSVGExport, XML_NAMESPACE_NONE, "g", true, true );
{
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", "dummy-slide" );
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", "Slide" );
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 0b8ebfc988ff..d0484e68825b 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -1834,7 +1834,7 @@ OUString SVGActionWriter::GetPathString( const tools::PolyPolygon& rPolyPoly, bo
}
}
- return aPathData.makeStringAndClear();
+ return aPathData.makeStringAndClear();
}
@@ -1917,48 +1917,48 @@ void SVGActionWriter::ImplAddLineAttr( const LineInfo &rAttrs )
sal_Int32 nStrokeWidth = ImplMap( rAttrs.GetWidth() );
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStrokeWidth,
OUString::number( nStrokeWidth ) );
- // support for LineJoint
- switch(rAttrs.GetLineJoin())
- {
- case basegfx::B2DLineJoin::NONE:
- case basegfx::B2DLineJoin::Miter:
- {
- mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, "miter");
- break;
- }
- case basegfx::B2DLineJoin::Bevel:
+ // support for LineJoint
+ switch(rAttrs.GetLineJoin())
{
- mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, "bevel");
- break;
- }
- case basegfx::B2DLineJoin::Round:
- {
- mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, "round");
- break;
+ case basegfx::B2DLineJoin::NONE:
+ case basegfx::B2DLineJoin::Miter:
+ {
+ mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, "miter");
+ break;
+ }
+ case basegfx::B2DLineJoin::Bevel:
+ {
+ mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, "bevel");
+ break;
+ }
+ case basegfx::B2DLineJoin::Round:
+ {
+ mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, "round");
+ break;
+ }
}
- }
- // support for LineCap
- switch(rAttrs.GetLineCap())
- {
- default: /* css::drawing::LineCap_BUTT */
- {
- // butt is Svg default, so no need to write until the exporter might write styles.
- // If this happens, activate here
- // mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinecap, "butt");
- break;
- }
- case css::drawing::LineCap_ROUND:
- {
- mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinecap, "round");
- break;
- }
- case css::drawing::LineCap_SQUARE:
+ // support for LineCap
+ switch(rAttrs.GetLineCap())
{
- mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinecap, "square");
- break;
+ default: /* css::drawing::LineCap_BUTT */
+ {
+ // butt is Svg default, so no need to write until the exporter might write styles.
+ // If this happens, activate here
+ // mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinecap, "butt");
+ break;
+ }
+ case css::drawing::LineCap_ROUND:
+ {
+ mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinecap, "round");
+ break;
+ }
+ case css::drawing::LineCap_SQUARE:
+ {
+ mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinecap, "square");
+ break;
+ }
}
- }
}
diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx
index 5eb7a4058ee7..b6aeebe59ba0 100644
--- a/filter/source/t602/t602filter.cxx
+++ b/filter/source/t602/t602filter.cxx
@@ -621,7 +621,7 @@ unsigned char T602ImportFilter::Setformat602(const char *cmd)
ch = Readchar602();
- if (cmd[0]=='M' && cmd[1]=='T') format602.mt = readnum(&ch,false);
+ if (cmd[0]=='M' && cmd[1]=='T') format602.mt = readnum(&ch,false);
else if (cmd[0]=='M' && cmd[1]=='B') format602.mb = readnum(&ch,false);
// else if (cmd[0]=='T' && cmd[1]=='B') {}
// else if (cmd[0]=='H' && cmd[1]=='E') {}
@@ -666,7 +666,7 @@ tnode T602ImportFilter::PointCmd602(unsigned char *ch)
// warning: uChar -> char
pcmd[1] = static_cast<char>(rtl::toAsciiUpperCase(*ch)); inschr(*ch);
- if (pcmd[0]=='P' && pcmd[1]=='A') { if (pst.pars) pst.willbeeop = true; }
+ if (pcmd[0]=='P' && pcmd[1]=='A') { if (pst.pars) pst.willbeeop = true; }
else if (pcmd[0]=='C' && pcmd[1]=='P') { if (pst.pars) pst.willbeeop = true; }
else if (pcmd[0]=='P' && pcmd[1]=='I') {
while (*ch && (*ch != '\n') && (*ch != ','))
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
index 9cafc79cf542..4d0667e463e8 100644
--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
+++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
@@ -260,7 +260,7 @@ bool XmlFilterAdaptor::exportImpl( const Sequence< css::beans::PropertyValue >&
}
// create an XProperty set to configure the exporter for pretty printing
- PropertyMapEntry aImportInfoMap[] =
+ PropertyMapEntry aImportInfoMap[] =
{
{ OUString("UsePrettyPrinting"), 0, cppu::UnoType<sal_Bool>::get(), PropertyAttribute::MAYBEVOID, 0},
{ OUString("ExportTextNumberElement"), 0, cppu::UnoType<sal_Bool>::get(), PropertyAttribute::MAYBEVOID, 0},
@@ -268,13 +268,13 @@ bool XmlFilterAdaptor::exportImpl( const Sequence< css::beans::PropertyValue >&
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
- Reference< XPropertySet > xInfoSet(
+ Reference< XPropertySet > xInfoSet(
GenericPropertySet_CreateInstance( new PropertySetInfo( aImportInfoMap ) ) );
- xInfoSet->setPropertyValue("UsePrettyPrinting", makeAny( bPrettyPrint ));
+ xInfoSet->setPropertyValue("UsePrettyPrinting", makeAny( bPrettyPrint ));
xInfoSet->setPropertyValue(
"ExportTextNumberElement",
makeAny( bExportTextNumberElementForListItems ));
- xInfoSet->setPropertyValue("BaseURI", makeAny( aBaseURI ));
+ xInfoSet->setPropertyValue("BaseURI", makeAny( aBaseURI ));
aAnys[1] <<= xInfoSet;
Reference< XExporter > xExporter( mxContext->getServiceManager()->createInstanceWithArgumentsAndContext(
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index e5bbba97ee3e..673481b8e1b5 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -871,7 +871,7 @@ void XMLFilterSettingsDialog::onSave()
}
// Open Fileopen-Dialog
- ::sfx2::FileDialogHelper aDlg(
+ ::sfx2::FileDialogHelper aDlg(
css::ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION,
FileDialogFlags::NONE, GetFrameWeld());
@@ -916,9 +916,9 @@ void XMLFilterSettingsDialog::onOpen()
std::vector< std::unique_ptr<filter_info_impl> > aFilters;
// Open Fileopen-Dialog
- ::sfx2::FileDialogHelper aDlg(
- css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
- FileDialogFlags::NONE, GetFrameWeld());
+ ::sfx2::FileDialogHelper aDlg(
+ css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
+ FileDialogFlags::NONE, GetFrameWeld());
OUString aExtensions( "*.jar" );
OUString aFilterName(XsltResId(STR_FILTER_PACKAGE));
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index c245ad4c0c31..cff46da8580c 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -280,7 +280,7 @@ void XMLFilterTestDialog::onExportBrowse()
try
{
// Open Fileopen-Dialog
- ::sfx2::FileDialogHelper aDlg(
+ ::sfx2::FileDialogHelper aDlg(
css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
FileDialogFlags::NONE, m_xDialog.get());
@@ -517,7 +517,7 @@ void XMLFilterTestDialog::displayXMLFile( const OUString& rURL )
void XMLFilterTestDialog::onImportBrowse()
{
// Open Fileopen-Dialog
- ::sfx2::FileDialogHelper aDlg(
+ ::sfx2::FileDialogHelper aDlg(
css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
FileDialogFlags::NONE, m_xDialog.get());
OUString aFilterName( m_xFilterInfo->maInterfaceName );
More information about the Libreoffice-commits
mailing list