strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tdf#123936 Formatting files in module toolkit with clang-format

Browse source 
Change-Id: Ib4ee991a05335247d65343dfd3c3bcaf214a9e06
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105720
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
This commit is contained in:
Philipp Hofer 2020-11-12 13:22:46 +01:00 committed by Christian Lohmaier
parent 49fbda99b4
commit 0ce8680112
8 changed files with 54 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
solenv/clang-format/excludelist
View file

@ -15153,7 +15153,6 @@ toolkit/inc/controls/eventcontainer.hxx
toolkit/inc/controls/filectrl.hxx
toolkit/inc/controls/formattedcontrol.hxx
toolkit/inc/controls/geometrycontrolmodel.hxx
toolkit/inc/controls/geometrycontrolmodel_impl.hxx
toolkit/inc/controls/roadmapcontrol.hxx
toolkit/inc/controls/roadmapentry.hxx
toolkit/inc/controls/stdtabcontroller.hxx
@ -15169,7 +15168,6 @@ toolkit/inc/helper/accessibilityclient.hxx
toolkit/inc/helper/btndlg.hxx
toolkit/inc/helper/imagealign.hxx
toolkit/inc/helper/scrollabledialog.hxx
toolkit/inc/helper/tkresmgr.hxx
toolkit/inc/helper/unopropertyarrayhelper.hxx
toolkit/inc/helper/unowrapper.hxx
toolkit/source/awt/animatedimagespeer.cxx
@ -15193,9 +15191,7 @@ toolkit/source/awt/vclxtabpagecontainer.cxx
toolkit/source/awt/vclxtoolkit.cxx
toolkit/source/awt/vclxtopwindow.cxx
toolkit/source/awt/vclxwindow.cxx
toolkit/source/awt/vclxwindow1.cxx
toolkit/source/awt/vclxwindows.cxx
toolkit/source/awt/vclxwindows_internal.hxx
toolkit/source/controls/accessiblecontrolcontext.cxx
toolkit/source/controls/animatedimages.cxx
toolkit/source/controls/controlmodelcontainerbase.cxx
@ -15218,13 +15214,11 @@ toolkit/source/controls/roadmapentry.cxx
toolkit/source/controls/spinningprogress.cxx
toolkit/source/controls/stdtabcontroller.cxx
toolkit/source/controls/stdtabcontrollermodel.cxx
toolkit/source/controls/svmedit.cxx
toolkit/source/controls/tabpagecontainer.cxx
toolkit/source/controls/tabpagemodel.cxx
toolkit/source/controls/tkscrollbar.cxx
toolkit/source/controls/tkspinbutton.cxx
toolkit/source/controls/tree/treecontrol.cxx
toolkit/source/controls/tree/treecontrol.hxx
toolkit/source/controls/tree/treecontrolpeer.cxx
toolkit/source/controls/tree/treedatamodel.cxx
toolkit/source/controls/unocontrol.cxx
@ -15239,7 +15233,6 @@ toolkit/source/helper/formpdfexport.cxx
toolkit/source/helper/imagealign.cxx
toolkit/source/helper/listenermultiplexer.cxx
toolkit/source/helper/property.cxx
toolkit/source/helper/tkresmgr.cxx
toolkit/source/helper/unopropertyarrayhelper.cxx
toolkit/source/helper/unowrapper.cxx
toolkit/source/helper/vclunohelper.cxx

25
toolkit/inc/controls/geometrycontrolmodel_impl.hxx
View file

@ -19,33 +19,32 @@
// no include protection. This is included from within geometrycontrolmodel.hxx only
//= OGeometryControlModel
template <class CONTROLMODEL>
OGeometryControlModel<CONTROLMODEL>::OGeometryControlModel( const css::uno::Reference< css::uno::XComponentContext >& i_factory )
:OGeometryControlModel_Base(new CONTROLMODEL( i_factory ) )
OGeometryControlModel<CONTROLMODEL>::OGeometryControlModel(
const css::uno::Reference<css::uno::XComponentContext>& i_factory)
: OGeometryControlModel_Base(new CONTROLMODEL(i_factory))
{
}
template <class CONTROLMODEL>
OGeometryControlModel<CONTROLMODEL>::OGeometryControlModel(css::uno::Reference< css::util::XCloneable >& _rxAggregateInstance)
:OGeometryControlModel_Base(_rxAggregateInstance)
OGeometryControlModel<CONTROLMODEL>::OGeometryControlModel(
css::uno::Reference<css::util::XCloneable>& _rxAggregateInstance)
: OGeometryControlModel_Base(_rxAggregateInstance)
{
}
template <class CONTROLMODEL>
::cppu::IPropertyArrayHelper& SAL_CALL OGeometryControlModel<CONTROLMODEL>::getInfoHelper()
{
return *this->getArrayHelper();
}
template <class CONTROLMODEL>
void OGeometryControlModel<CONTROLMODEL>::fillProperties(css::uno::Sequence< css::beans::Property >& _rProps, css::uno::Sequence< css::beans::Property >& _rAggregateProps) const
void OGeometryControlModel<CONTROLMODEL>::fillProperties(
css::uno::Sequence<css::beans::Property>& _rProps,
css::uno::Sequence<css::beans::Property>& _rAggregateProps) const
{
// our own properties
OPropertyContainer::describeProperties(_rProps);
@ -54,17 +53,15 @@ void OGeometryControlModel<CONTROLMODEL>::fillProperties(css::uno::Sequence< css
_rAggregateProps = m_xAggregateSet->getPropertySetInfo()->getProperties();
}
template <class CONTROLMODEL>
css::uno::Sequence< sal_Int8 > SAL_CALL OGeometryControlModel<CONTROLMODEL>::getImplementationId( )
css::uno::Sequence<sal_Int8> SAL_CALL OGeometryControlModel<CONTROLMODEL>::getImplementationId()
{
return css::uno::Sequence<sal_Int8>();
}
template <class CONTROLMODEL>
OGeometryControlModel_Base* OGeometryControlModel<CONTROLMODEL>::createClone_Impl(
css::uno::Reference< css::util::XCloneable >& _rxAggregateInstance)
css::uno::Reference<css::util::XCloneable>& _rxAggregateInstance)
{
return new OGeometryControlModel<CONTROLMODEL>(_rxAggregateInstance);
}

3
toolkit/inc/helper/tkresmgr.hxx
View file

@ -26,10 +26,9 @@ class Image;
namespace TkResMgr
{
Image getImageFromURL( const OUString& i_rImageURL );
Image getImageFromURL(const OUString& i_rImageURL);
};
#endif // INCLUDED_TOOLKIT_INC_HELPER_TKRESMGR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

35
toolkit/source/awt/vclxwindow1.cxx
View file

@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <toolkit/awt/vclxwindow.hxx>
#include <com/sun/star/beans/NamedValue.hpp>
#include <vcl/wrkwin.hxx>
@ -26,7 +25,7 @@
#ifdef _WIN32
#include <prewin.h>
#include <postwin.h>
#elif defined ( MACOSX )
#elif defined(MACOSX)
#include <premac.h>
#include <Cocoa/Cocoa.h>
#include <postmac.h>
@ -34,11 +33,11 @@
#include <vcl/sysdata.hxx>
/// helper method to set a window handle into a SystemParentData struct
void VCLXWindow::SetSystemParent_Impl( const css::uno::Any& rHandle )
void VCLXWindow::SetSystemParent_Impl(const css::uno::Any& rHandle)
{
// does only work for WorkWindows
VclPtr<vcl::Window> pWindow = GetWindow();
if ( pWindow->GetType() != WindowType::WORKWINDOW )
if (pWindow->GetType() != WindowType::WORKWINDOW)
{
css::uno::RuntimeException aException;
aException.Message = "not a work window";
@ -48,25 +47,25 @@ void VCLXWindow::SetSystemParent_Impl( const css::uno::Any& rHandle )
// use sal_Int64 here to accommodate all int types
// uno::Any shift operator whill upcast if necessary
sal_Int64 nHandle = 0;
bool bXEmbed = false;
bool bXEmbed = false;
bool bThrow = false;
if( ! (rHandle >>= nHandle) )
if (!(rHandle >>= nHandle))
{
css::uno::Sequence< css::beans::NamedValue > aProps;
if( rHandle >>= aProps )
css::uno::Sequence<css::beans::NamedValue> aProps;
if (rHandle >>= aProps)
{
for( const css::beans::NamedValue& rProp : std::as_const(aProps) )
for (const css::beans::NamedValue& rProp : std::as_const(aProps))
{
if ( rProp.Name == "WINDOW" )
if (rProp.Name == "WINDOW")
rProp.Value >>= nHandle;
else if ( rProp.Name == "XEMBED" )
else if (rProp.Name == "XEMBED")
rProp.Value >>= bXEmbed;
}
}
else
bThrow = true;
}
if( bThrow )
if (bThrow)
{
css::uno::RuntimeException aException;
aException.Message = "incorrect window handle type";
@ -74,22 +73,22 @@ void VCLXWindow::SetSystemParent_Impl( const css::uno::Any& rHandle )
}
// create system parent data
SystemParentData aSysParentData;
aSysParentData.nSize = sizeof ( SystemParentData );
aSysParentData.nSize = sizeof(SystemParentData);
#if defined(_WIN32)
aSysParentData.hWnd = reinterpret_cast<HWND>(nHandle);
#elif defined( MACOSX )
#elif defined(MACOSX)
aSysParentData.pView = reinterpret_cast<NSView*>(nHandle);
#elif defined( ANDROID )
#elif defined(ANDROID)
// Nothing
#elif defined( IOS )
#elif defined(IOS)
// Nothing
#elif defined( UNX )
#elif defined(UNX)
aSysParentData.aWindow = nHandle;
aSysParentData.bXEmbedSupport = bXEmbed;
#endif
// set system parent
static_cast<WorkWindow*>(pWindow.get())->SetPluginParent( &aSysParentData );
static_cast<WorkWindow*>(pWindow.get())->SetPluginParent(&aSysParentData);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
toolkit/source/awt/vclxwindows_internal.hxx
View file

@ -24,8 +24,8 @@
namespace toolkit
{
void setButtonLikeFaceColor( vcl::Window* _pWindow, const css::uno::Any& _rColorValue );
css::uno::Any getButtonLikeFaceColor( const vcl::Window* _pWindow );
void setButtonLikeFaceColor(vcl::Window* _pWindow, const css::uno::Any& _rColorValue);
css::uno::Any getButtonLikeFaceColor(const vcl::Window* _pWindow);
}
#endif // INCLUDED_TOOLKIT_SOURCE_AWT_VCLXWINDOWS_INTERNAL_HXX

11
toolkit/source/controls/svmedit.cxx
View file

@ -20,20 +20,19 @@
#include <toolkit/awt/vclxwindows.hxx>
#include <controls/svmedit.hxx>
MultiLineEdit::MultiLineEdit( vcl::Window* pParent, WinBits nWinStyle )
: VclMultiLineEdit( pParent,nWinStyle )
MultiLineEdit::MultiLineEdit(vcl::Window* pParent, WinBits nWinStyle)
: VclMultiLineEdit(pParent, nWinStyle)
{
}
// virtual
css::uno::Reference< css::awt::XWindowPeer >
MultiLineEdit::GetComponentInterface(bool bCreate)
css::uno::Reference<css::awt::XWindowPeer> MultiLineEdit::GetComponentInterface(bool bCreate)
{
css::uno::Reference< css::awt::XWindowPeer > xPeer(
css::uno::Reference<css::awt::XWindowPeer> xPeer(
VclMultiLineEdit::GetComponentInterface(false));
if (!xPeer.is() && bCreate)
{
rtl::Reference< VCLXMultiLineEdit > xVCLMEdit(new VCLXMultiLineEdit);
rtl::Reference<VCLXMultiLineEdit> xVCLMEdit(new VCLXMultiLineEdit);
xVCLMEdit->SetWindow(this);
xPeer = xVCLMEdit.get();
SetComponentInterface(xPeer);

17
toolkit/source/controls/tree/treecontrol.hxx
View file

@ -22,31 +22,32 @@
#include <toolkit/controls/unocontrolmodel.hxx>
namespace toolkit {
namespace toolkit
{
// = UnoTreeModel
class UnoTreeModel : public UnoControlModel
{
protected:
css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override;
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
css::uno::Any ImplGetDefaultValue(sal_uInt16 nPropId) const override;
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
public:
explicit UnoTreeModel( const css::uno::Reference< css::uno::XComponentContext >& i_factory );
explicit UnoTreeModel(const css::uno::Reference<css::uno::XComponentContext>& i_factory);
rtl::Reference<UnoControlModel> Clone() const override;
// css::beans::XMultiPropertySet
css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override;
css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override;
// css::io::XPersistObject
OUString SAL_CALL getServiceName() override;
// XServiceInfo
OUString SAL_CALL getImplementationName() override
{ return "stardiv.Toolkit.TreeControlModel"; }
{
return "stardiv.Toolkit.TreeControlModel";
}
css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{

17
toolkit/source/helper/tkresmgr.cxx
View file

@ -32,21 +32,22 @@ using ::com::sun::star::graphic::XGraphic;
using ::com::sun::star::graphic::XGraphicProvider;
using namespace ::com::sun::star;
Image TkResMgr::getImageFromURL( const OUString& i_rImageURL )
Image TkResMgr::getImageFromURL(const OUString& i_rImageURL)
{
if ( i_rImageURL.isEmpty() )
if (i_rImageURL.isEmpty())
return Image();
try
{
Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
Reference< XGraphicProvider > xProvider( graphic::GraphicProvider::create(xContext) );
Reference<uno::XComponentContext> xContext(::comphelper::getProcessComponentContext());
Reference<XGraphicProvider> xProvider(graphic::GraphicProvider::create(xContext));
::comphelper::NamedValueCollection aMediaProperties;
aMediaProperties.put( "URL", i_rImageURL );
Reference< XGraphic > xGraphic = xProvider->queryGraphic( aMediaProperties.getPropertyValues() );
return Image( xGraphic );
aMediaProperties.put("URL", i_rImageURL);
Reference<XGraphic> xGraphic
= xProvider->queryGraphic(aMediaProperties.getPropertyValues());
return Image(xGraphic);
}
catch( const uno::Exception& )
catch (const uno::Exception&)
{
DBG_UNHANDLED_EXCEPTION("toolkit");
}