diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-04-12 18:21:12 +0200 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-04-12 18:21:12 +0200 |
| commit | ab03b13fb4faa4201316d6d63a94955b4a72fcdc (patch) | |
| tree | daf0ca7a8c0dd481600e2b97134c215e2c1892e3 /sw/source/ui/envelp | |
| parent | c84af0cedc1c407d5e1a92fe172e134c08b130f6 (diff) | |
| parent | 95672348df2be4631642ce336ff48411bb3d21f7 (diff) | |
CWS-TOOLING: integrate CWS ppp02
Diffstat (limited to 'sw/source/ui/envelp')
| -rw-r--r-- | sw/source/ui/envelp/mailmrge.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index ae553ee89a19..141adf35ddf0 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -65,7 +65,7 @@ #include <com/sun/star/sdbc/XDataSource.hpp> #include <toolkit/unohlp.hxx> #include <comphelper/processfactory.hxx> -#include <com/sun/star/form/XFormController.hpp> +#include <com/sun/star/form/runtime/XFormController.hpp> #include <cppuhelper/implbase1.hxx> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/container/XContainerQuery.hpp> @@ -96,7 +96,7 @@ using namespace ::com::sun::star::ui::dialogs; ---------------------------------------------------------------------------*/ struct SwMailMergeDlg_Impl { - uno::Reference<XFormController> xFController; + uno::Reference<runtime::XFormController> xFController; uno::Reference<XSelectionChangeListener> xChgLstnr; uno::Reference<XSelectionSupplier> xSelSupp; }; @@ -329,7 +329,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell, pBeamerWin->Show(); } uno::Reference<XController> xController = xFrame->getController(); - pImpl->xFController = uno::Reference<XFormController>(xController, UNO_QUERY); + pImpl->xFController = uno::Reference<runtime::XFormController>(xController, UNO_QUERY); if(pImpl->xFController.is()) { uno::Reference< awt::XControl > xCtrl = pImpl->xFController->getCurrentControl( ); |