summaryrefslogtreecommitdiff
path: root/forms/source
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2014-05-09 20:04:08 +0200
committerThomas Arnhold <thomas@arnhold.org>2014-05-09 19:50:42 +0000
commit569ff6727e54d5ce8c19ae51a9a651a98c8096d3 (patch)
tree7089e0a8469425c58878de805cd6861c5dd7288c /forms/source
parent9037e2289d10aa8208d0e8f75847204d73ea21a7 (diff)
update_pch: add a bunch of pch files
I had to fix some source files because of macro redefinitions and such stuff. Small modules like basic have a great win, too: make basic.clean && time make basic: with w/o pch pch accessibility 23s 1m59s basctl 30s 1m42s basic 56s 1m35s comphelper 23s 51s editeng 48s 2m04s forms 40s 1m40s unotools 19s 38s sd 3m37s 4m33s Change-Id: Id24cdcddbe2ff64820b42266325c25af1355558f Reviewed-on: https://gerrit.libreoffice.org/9293 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'forms/source')
-rw-r--r--forms/source/component/formcontrolfont.cxx4
-rw-r--r--forms/source/misc/InterfaceContainer.cxx4
-rw-r--r--forms/source/richtext/richtextvclcontrol.cxx6
3 files changed, 4 insertions, 10 deletions
diff --git a/forms/source/component/formcontrolfont.cxx b/forms/source/component/formcontrolfont.cxx
index 7c1b3a4fc2a1..db64e80a676e 100644
--- a/forms/source/component/formcontrolfont.cxx
+++ b/forms/source/component/formcontrolfont.cxx
@@ -124,7 +124,7 @@ namespace frm
FontControlModel::FontControlModel( bool _bToolkitCompatibleDefaults )
- :m_nFontRelief( FontRelief::NONE )
+ :m_nFontRelief( css::awt::FontRelief::NONE )
,m_nFontEmphasis( FontEmphasisMark::NONE )
,m_bToolkitCompatibleDefaults( _bToolkitCompatibleDefaults )
{
@@ -509,7 +509,7 @@ namespace frm
break;
case PROPERTY_ID_FONTRELIEF:
- aReturn <<= FontRelief::NONE;
+ aReturn <<= css::awt::FontRelief::NONE;
bHandled = true;
break;
}
diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx
index 8532aae19888..636d35db3fae 100644
--- a/forms/source/misc/InterfaceContainer.cxx
+++ b/forms/source/misc/InterfaceContainer.cxx
@@ -272,7 +272,7 @@ void OInterfaceContainer::disposing()
m_aMap.clear();
m_aItems.clear();
- EventObject aEvt(static_cast<XContainer*>(this));
+ css::lang::EventObject aEvt(static_cast<XContainer*>(this));
m_aContainerListeners.disposeAndClear(aEvt);
}
@@ -634,7 +634,7 @@ void SAL_CALL OInterfaceContainer::removeContainerListener(const Reference<XCont
// XEventListener
-void SAL_CALL OInterfaceContainer::disposing(const EventObject& _rSource) throw( RuntimeException, std::exception )
+void SAL_CALL OInterfaceContainer::disposing(const css::lang::EventObject& _rSource) throw( RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_rMutex );
diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx
index 87ae592c7035..22808dad85c5 100644
--- a/forms/source/richtext/richtextvclcontrol.cxx
+++ b/forms/source/richtext/richtextvclcontrol.cxx
@@ -41,14 +41,8 @@
namespace frm
{
-
-
- using namespace ::com::sun::star::awt;
-
-
//= RichTextControl
-
RichTextControl::RichTextControl( RichTextEngine* _pEngine, Window* _pParent, WinBits _nStyle,
ITextAttributeListener* _pTextAttribListener, ITextSelectionListener* _pSelectionListener )
:Control( _pParent, implInitStyle( _nStyle ) )