diff options
author | Mathias Bauer <mba@openoffice.org> | 2010-02-02 09:46:49 +0100 |
---|---|---|
committer | Mathias Bauer <mba@openoffice.org> | 2010-02-02 09:46:49 +0100 |
commit | e8ed1f484cf846063babce16b887e4e556550afa (patch) | |
tree | b2336ad384f1938bac7d89081b4e4cb997962edf /vbahelper | |
parent | fb07f6ce9d4aabe59fc802e8a0ce1e114810c835 (diff) |
errorneously added file removed
Diffstat (limited to 'vbahelper')
-rw-r--r-- | vbahelper/source/vbahelper/vbahelper.cxx.rej | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx.rej b/vbahelper/source/vbahelper/vbahelper.cxx.rej deleted file mode 100644 index e6d2d95a74..0000000000 --- a/vbahelper/source/vbahelper/vbahelper.cxx.rej +++ /dev/null @@ -1,45 +0,0 @@ -*************** -*** 67,73 **** - #include <toolkit/awt/vclxwindow.hxx> - #include <toolkit/helper/vclunohelper.hxx> - #include <com/sun/star/frame/XModel2.hpp> -- #include <com/sun/star/lang/XUnoTunnel.hpp> - #include <vcl/window.hxx> - #include <vcl/syswin.hxx> - #include <tools/diagnose_ex.h> ---- 67,72 ---- - #include <toolkit/awt/vclxwindow.hxx> - #include <toolkit/helper/vclunohelper.hxx> - #include <com/sun/star/frame/XModel2.hpp> - #include <vcl/window.hxx> - #include <vcl/syswin.hxx> - #include <tools/diagnose_ex.h> -*************** UserFormGeometryHelper::UserFormGeometryHelper( const uno::Reference< uno::XComp -*** 1117,1135 **** - double points = double( static_cast<double>(_hmm) / factor); - return points; - } -- -- SfxObjectShell* getSfxObjShell( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException) -- { -- SfxObjectShell* pFoundShell = NULL; -- if ( xModel.is() ) -- { -- uno::Reference< lang::XUnoTunnel > xObjShellTunnel( xModel, uno::UNO_QUERY_THROW ); -- pFoundShell = reinterpret_cast<SfxObjectShell*>( xObjShellTunnel->getSomething(SfxObjectShell::getUnoTunnelId())); -- } -- if ( !pFoundShell ) -- throw uno::RuntimeException(); -- return pFoundShell; -- } - - } // openoffice - } //org ---- 1116,1122 ---- - double points = double( static_cast<double>(_hmm) / factor); - return points; - } -+ - - } // openoffice - } //org |