diff options
author | Tor Lillqvist <tml@collabora.com> | 2015-04-28 23:09:13 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2015-04-30 07:27:52 +0300 |
commit | d883c12556a71c5d3719454b1f95809a505f0ace (patch) | |
tree | 6f0c1cc518a3727db95b72d609ec9db793041b20 /toolkit | |
parent | d1ca0f4ed0e30394ce6759a20d4896651dd43051 (diff) |
Get rid of the initial :: for the vcl namespace
We used it all over the place without leading :: already anyway, even
in many files in include. So let's be consistent. In the majority of
cases, prefer the easier-on-the-eyes choice, not the "safe" one.
In those files in include where *all* existing uses of ::vcl:: indeed
used the :: prefix, there let's keep it for consistency.
Change-Id: If99cb41d3bf290d38c601d91125c3c8d935e61d0
Diffstat (limited to 'toolkit')
-rw-r--r-- | toolkit/source/helper/formpdfexport.cxx | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx index c9f95ab91e25..332d9fd4e0c9 100644 --- a/toolkit/source/helper/formpdfexport.cxx +++ b/toolkit/source/helper/formpdfexport.cxx @@ -80,20 +80,20 @@ namespace toolkitform /** (default-)creates a PDF widget according to a given FormComponentType */ - ::vcl::PDFWriter::AnyWidget* createDefaultWidget( sal_Int16 _nFormComponentType ) + vcl::PDFWriter::AnyWidget* createDefaultWidget( sal_Int16 _nFormComponentType ) { switch ( _nFormComponentType ) { case FormComponentType::COMMANDBUTTON: - return new ::vcl::PDFWriter::PushButtonWidget; + return new vcl::PDFWriter::PushButtonWidget; case FormComponentType::CHECKBOX: - return new ::vcl::PDFWriter::CheckBoxWidget; + return new vcl::PDFWriter::CheckBoxWidget; case FormComponentType::RADIOBUTTON: - return new ::vcl::PDFWriter::RadioButtonWidget; + return new vcl::PDFWriter::RadioButtonWidget; case FormComponentType::LISTBOX: - return new ::vcl::PDFWriter::ListBoxWidget; + return new vcl::PDFWriter::ListBoxWidget; case FormComponentType::COMBOBOX: - return new ::vcl::PDFWriter::ComboBoxWidget; + return new vcl::PDFWriter::ComboBoxWidget; case FormComponentType::TEXTFIELD: case FormComponentType::FILECONTROL: @@ -102,7 +102,7 @@ namespace toolkitform case FormComponentType::NUMERICFIELD: case FormComponentType::CURRENCYFIELD: case FormComponentType::PATTERNFIELD: - return new ::vcl::PDFWriter::EditWidget; + return new vcl::PDFWriter::EditWidget; } return NULL; } @@ -255,7 +255,7 @@ namespace toolkitform /** creates a PDF compatible control descriptor for the given control */ std::unique_ptr<vcl::PDFWriter::AnyWidget> describePDFControl( const Reference< XControl >& _rxControl, - ::vcl::PDFExtOutDevData& i_pdfExportData ) + vcl::PDFExtOutDevData& i_pdfExportData ) { std::unique_ptr<vcl::PDFWriter::AnyWidget> Descriptor; OSL_ENSURE( _rxControl.is(), "describePDFControl: invalid (NULL) control!" ); @@ -418,9 +418,9 @@ namespace toolkitform // special widget properties // edits - if ( Descriptor->getType() == ::vcl::PDFWriter::Edit ) + if ( Descriptor->getType() == vcl::PDFWriter::Edit ) { - ::vcl::PDFWriter::EditWidget* pEditWidget = static_cast< ::vcl::PDFWriter::EditWidget* >( Descriptor.get() ); + vcl::PDFWriter::EditWidget* pEditWidget = static_cast< vcl::PDFWriter::EditWidget* >( Descriptor.get() ); // multiline (already flagged in the TextStyle) pEditWidget->MultiLine = ( Descriptor->TextStyle & TEXT_DRAW_MULTILINE ) != 0; @@ -454,9 +454,9 @@ namespace toolkitform // buttons - if ( Descriptor->getType() == ::vcl::PDFWriter::PushButton ) + if ( Descriptor->getType() == vcl::PDFWriter::PushButton ) { - ::vcl::PDFWriter::PushButtonWidget* pButtonWidget = static_cast< ::vcl::PDFWriter::PushButtonWidget* >( Descriptor.get() ); + vcl::PDFWriter::PushButtonWidget* pButtonWidget = static_cast< vcl::PDFWriter::PushButtonWidget* >( Descriptor.get() ); FormButtonType eButtonType = FormButtonType_PUSH; OSL_VERIFY( xModelProps->getPropertyValue("ButtonType") >>= eButtonType ); static const char FM_PROP_TARGET_URL[] = "TargetURL"; @@ -491,8 +491,8 @@ namespace toolkitform pButtonWidget->Dest = i_pdfExportData.RegisterDest(); // and put it into the bookmarks, to ensure the future handling really happens - ::std::vector< ::vcl::PDFExtOutDevBookmarkEntry >& rBookmarks( i_pdfExportData.GetBookmarks() ); - ::vcl::PDFExtOutDevBookmarkEntry aBookmark; + ::std::vector< vcl::PDFExtOutDevBookmarkEntry >& rBookmarks( i_pdfExportData.GetBookmarks() ); + vcl::PDFExtOutDevBookmarkEntry aBookmark; aBookmark.nDestId = pButtonWidget->Dest; aBookmark.aBookmark = sURL; rBookmarks.push_back( aBookmark ); @@ -519,9 +519,9 @@ namespace toolkitform // check boxes static const char FM_PROP_STATE[] = "State"; - if ( Descriptor->getType() == ::vcl::PDFWriter::CheckBox ) + if ( Descriptor->getType() == vcl::PDFWriter::CheckBox ) { - ::vcl::PDFWriter::CheckBoxWidget* pCheckBoxWidget = static_cast< ::vcl::PDFWriter::CheckBoxWidget* >( Descriptor.get() ); + vcl::PDFWriter::CheckBoxWidget* pCheckBoxWidget = static_cast< vcl::PDFWriter::CheckBoxWidget* >( Descriptor.get() ); sal_Int16 nState = 0; OSL_VERIFY( xModelProps->getPropertyValue( FM_PROP_STATE ) >>= nState ); pCheckBoxWidget->Checked = ( nState != 0 ); @@ -529,9 +529,9 @@ namespace toolkitform // radio buttons - if ( Descriptor->getType() == ::vcl::PDFWriter::RadioButton ) + if ( Descriptor->getType() == vcl::PDFWriter::RadioButton ) { - ::vcl::PDFWriter::RadioButtonWidget* pRadioWidget = static_cast< ::vcl::PDFWriter::RadioButtonWidget* >( Descriptor.get() ); + vcl::PDFWriter::RadioButtonWidget* pRadioWidget = static_cast< vcl::PDFWriter::RadioButtonWidget* >( Descriptor.get() ); sal_Int16 nState = 0; OSL_VERIFY( xModelProps->getPropertyValue( FM_PROP_STATE ) >>= nState ); pRadioWidget->Selected = ( nState != 0 ); @@ -549,9 +549,9 @@ namespace toolkitform // list boxes - if ( Descriptor->getType() == ::vcl::PDFWriter::ListBox ) + if ( Descriptor->getType() == vcl::PDFWriter::ListBox ) { - ::vcl::PDFWriter::ListBoxWidget* pListWidget = static_cast< ::vcl::PDFWriter::ListBoxWidget* >( Descriptor.get() ); + vcl::PDFWriter::ListBoxWidget* pListWidget = static_cast< vcl::PDFWriter::ListBoxWidget* >( Descriptor.get() ); // drop down static const char FM_PROP_DROPDOWN[] = "Dropdown"; @@ -583,9 +583,9 @@ namespace toolkitform // combo boxes - if ( Descriptor->getType() == ::vcl::PDFWriter::ComboBox ) + if ( Descriptor->getType() == vcl::PDFWriter::ComboBox ) { - ::vcl::PDFWriter::ComboBoxWidget* pComboWidget = static_cast< ::vcl::PDFWriter::ComboBoxWidget* >( Descriptor.get() ); + vcl::PDFWriter::ComboBoxWidget* pComboWidget = static_cast< vcl::PDFWriter::ComboBoxWidget* >( Descriptor.get() ); // entries getStringItemVector( xModelProps, pComboWidget->Entries ); |