[Libreoffice-commits] core.git: svx/source

Thomas Arnhold thomas at arnhold.org
Wed May 28 10:07:09 PDT 2014


 svx/source/form/fmshimp.cxx            |    2 +-
 svx/source/form/fmtextcontrolshell.cxx |    6 +++---
 svx/source/form/navigatortree.cxx      |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 103f60e500343194b9a40c17467fc6e51563ac34
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Wed May 28 19:02:00 2014 +0200

    fix pch build
    
    Change-Id: I6bdbdaa667c943abd6c53af14779f5a8c2fb8884

diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 732d947..3a6b82d 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -3993,7 +3993,7 @@ bool FmXFormShell::HasControlFocus() const
 
     try
     {
-        Reference< XFormController > xController( getActiveController() );
+        Reference< runtime::XFormController > xController( getActiveController() );
         Reference< XControl > xCurrentControl;
         if ( xController.is() )
             xCurrentControl.set( xController->getCurrentControl() );
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index bc46692..fae746c 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -1053,7 +1053,7 @@ namespace svx
     }
 
 
-    void FmTextControlShell::formActivated( const Reference< XFormController >& _rxController )
+    void FmTextControlShell::formActivated( const Reference< runtime::XFormController >& _rxController )
     {
 #if OSL_DEBUG_LEVEL > 0
         OString sTrace( "FmTextControlShell::formActivated: 0x" );
@@ -1081,7 +1081,7 @@ namespace svx
     }
 
 
-    void FmTextControlShell::formDeactivated( const Reference< XFormController >& _rxController )
+    void FmTextControlShell::formDeactivated( const Reference< runtime::XFormController >& _rxController )
     {
 #if OSL_DEBUG_LEVEL > 0
         OString sTrace( "FmTextControlShell::formDeactivated: 0x" );
@@ -1097,7 +1097,7 @@ namespace svx
     }
 
 
-    void FmTextControlShell::startControllerListening( const Reference< XFormController >& _rxController )
+    void FmTextControlShell::startControllerListening( const Reference< runtime::XFormController >& _rxController )
     {
         OSL_PRECOND( _rxController.is(), "FmTextControlShell::startControllerListening: invalid controller!" );
         if ( !_rxController.is() )
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index f1254f1..477c393 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -1311,7 +1311,7 @@ namespace svxform
     }
 
 
-    bool NavigatorTree::EditingEntry( SvTreeListEntry* pEntry, Selection& rSelection )
+    bool NavigatorTree::EditingEntry( SvTreeListEntry* pEntry, ::Selection& rSelection )
     {
         if (!SvTreeListBox::EditingEntry( pEntry, rSelection ))
             return false;


More information about the Libreoffice-commits mailing list