summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2011-02-11 22:34:18 -0600
committerNorbert Thiebaud <nthiebaud@gmail.com>2011-02-11 22:34:18 -0600
commit51d1262b8046262c41f887ba44d45a91365bc8c3 (patch)
tree85f0785cf4860a762d860afc4eda14d9de5c4675
parentf9b4521edc6a2370ca773aa80d3719d4bb45190d (diff)
emerge non-conflicting changes in uui and vbahelper
-rw-r--r--uui/source/alreadyopen.cxx2
-rw-r--r--uui/source/alreadyopen.hxx2
-rw-r--r--uui/source/cookiedg.cxx6
-rw-r--r--uui/source/cookiedg.hxx4
-rw-r--r--uui/source/filechanged.cxx2
-rw-r--r--uui/source/filechanged.hxx2
-rw-r--r--uui/source/fltdlg.cxx11
-rw-r--r--uui/source/fltdlg.hxx7
-rw-r--r--uui/source/iahndl.cxx7
-rwxr-xr-xuui/source/iahndl.hxx32
-rwxr-xr-x[-rw-r--r--]uui/source/ids.hrc0
-rw-r--r--uui/source/interactionhandler.cxx3
-rw-r--r--uui/source/interactionhandler.hxx3
-rw-r--r--uui/source/lockfailed.cxx2
-rw-r--r--uui/source/lockfailed.hxx2
-rwxr-xr-xuui/source/logindlg.cxx7
-rwxr-xr-xuui/source/logindlg.hxx4
-rwxr-xr-x[-rw-r--r--]uui/source/logindlg.src0
-rw-r--r--uui/source/loginerr.hxx1
-rw-r--r--uui/source/masterpasscrtdlg.cxx13
-rw-r--r--uui/source/masterpasscrtdlg.hxx7
-rw-r--r--uui/source/masterpassworddlg.cxx6
-rw-r--r--uui/source/masterpassworddlg.hxx6
-rw-r--r--uui/source/mphndl.hxx2
-rwxr-xr-xuui/source/nameclashdlg.hxx1
-rw-r--r--uui/source/newerverwarn.cxx2
-rw-r--r--uui/source/newerverwarn.hxx2
-rw-r--r--uui/source/openlocked.cxx2
-rw-r--r--uui/source/openlocked.hxx2
-rw-r--r--uui/source/passworddlg.cxx1
-rw-r--r--uui/source/passworddlg.hxx1
-rwxr-xr-x[-rw-r--r--]uui/source/passworddlg.src0
-rwxr-xr-x[-rw-r--r--]uui/source/passworderrs.src0
-rw-r--r--uui/source/requeststringresolver.cxx3
-rw-r--r--uui/source/requeststringresolver.hxx3
-rw-r--r--uui/source/secmacrowarnings.cxx7
-rw-r--r--uui/source/secmacrowarnings.hxx2
-rw-r--r--uui/source/services.cxx3
-rw-r--r--uui/source/sslwarndlg.cxx10
-rw-r--r--uui/source/sslwarndlg.hxx4
-rw-r--r--uui/source/trylater.cxx2
-rw-r--r--uui/source/trylater.hxx2
-rw-r--r--uui/source/unknownauthdlg.cxx10
-rw-r--r--uui/source/unknownauthdlg.hxx5
-rw-r--r--uui/util/uui.xml1
-rw-r--r--vbahelper/source/msforms/makefile.mk72
-rw-r--r--vbahelper/source/msforms/vbabutton.hxx1
-rw-r--r--vbahelper/source/vbahelper/vbapropvalue.cxx45
48 files changed, 131 insertions, 181 deletions
diff --git a/uui/source/alreadyopen.cxx b/uui/source/alreadyopen.cxx
index b63e89cb7a..3c5cba966f 100644
--- a/uui/source/alreadyopen.cxx
+++ b/uui/source/alreadyopen.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -58,3 +59,4 @@ AlreadyOpenQueryBox::~AlreadyOpenQueryBox()
{
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/alreadyopen.hxx b/uui/source/alreadyopen.hxx
index 3fd695cc8f..fc1f74d989 100644
--- a/uui/source/alreadyopen.hxx
+++ b/uui/source/alreadyopen.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,3 +39,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/cookiedg.cxx b/uui/source/cookiedg.cxx
index fea8b9a274..3f987477a5 100644
--- a/uui/source/cookiedg.cxx
+++ b/uui/source/cookiedg.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,13 +30,9 @@
#include <tools/urlobj.hxx>
#include <vcl/msgbox.hxx>
-#ifndef UUI_COOKIEDG_HRC
#include <cookiedg.hrc>
-#endif
#include <cookiedg.hxx>
-#ifndef UUI_IDS_HRC
#include <ids.hrc>
-#endif
// CookiesDialog ---------------------------------------------------------
@@ -142,3 +139,4 @@ short CookiesDialog::Execute()
return nRet;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/cookiedg.hxx b/uui/source/cookiedg.hxx
index 23956945e7..70e797d7a5 100644
--- a/uui/source/cookiedg.hxx
+++ b/uui/source/cookiedg.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,9 +29,7 @@
#ifndef UUI_COOKIEDG_HXX
#define UUI_COOKIEDG_HXX
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/dialog.hxx>
#include <vcl/fixed.hxx>
#include <vcl/group.hxx>
@@ -63,3 +62,4 @@ public:
#endif // UUI_COOKIEDG_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/filechanged.cxx b/uui/source/filechanged.cxx
index 130f928fdb..75b5684286 100644
--- a/uui/source/filechanged.cxx
+++ b/uui/source/filechanged.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -47,3 +48,4 @@ FileChangedQueryBox::~FileChangedQueryBox()
{
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/filechanged.hxx b/uui/source/filechanged.hxx
index 2c37359753..54bfde22b1 100644
--- a/uui/source/filechanged.hxx
+++ b/uui/source/filechanged.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,3 +39,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx
index 3c09d66767..2cff694ef6 100644
--- a/uui/source/fltdlg.cxx
+++ b/uui/source/fltdlg.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,13 +32,9 @@
#include "fltdlg.hxx"
-#ifndef UUI_IDS_HRC
#include "ids.hrc"
-#endif
-#ifndef UUI_FLTDLG_HRC
#include "fltdlg.hrc"
-#endif
//_________________________________________________________________________________________________________________
// includes of other projects
@@ -48,10 +45,8 @@
#include <tools/list.hxx>
#include <tools/urlobj.hxx>
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
namespace uui
@@ -249,3 +244,5 @@ String FilterDialog::impl_buildUIFileName( const String& sName )
}
} // namespace uui
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/fltdlg.hxx b/uui/source/fltdlg.hxx
index f9cec7899a..5098512f9b 100644
--- a/uui/source/fltdlg.hxx
+++ b/uui/source/fltdlg.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,14 +35,10 @@
#include <vcl/dialog.hxx>
-#ifndef _MSGBOX_HXX
#include <vcl/msgbox.hxx>
-#endif
#include <vcl/lstbox.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/fixed.hxx>
#include <tools/string.hxx>
@@ -96,3 +93,5 @@ class FilterDialog : public ModalDialog
} // namespace uui
#endif // UUI_FLTDLG_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 7cfcc3688b..0602329bdf 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -1262,8 +1263,12 @@ UUIInteractionHelper::handleNameClashResolveRequest(
xReplaceExistingData->select();
break;
}
+
+ return aResult;
}
+} // namespace
+
void
UUIInteractionHelper::handleGenericErrorRequest(
sal_Int32 nErrorCode,
@@ -1493,7 +1498,7 @@ UUIInteractionHelper::handleBrokenPackageRequest(
::rtl::OUString aMessage;
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
std::auto_ptr< ResMgr > xManager(
ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui)));
if (!xManager.get())
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx
index 4acc3ebb31..4e21f125ee 100755
--- a/uui/source/iahndl.hxx
+++ b/uui/source/iahndl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -373,4 +374,35 @@ private:
};
*/
+class ErrorResource: private Resource
+{
+public:
+ inline ErrorResource(ResId & rResId) SAL_THROW(()): Resource(rResId) {}
+
+ inline ~ErrorResource() SAL_THROW(()) { FreeResource(); }
+
+ bool getString(ErrCode nErrorCode, rtl::OUString * pString) const
+ SAL_THROW(());
+};
+
+/*
+class InteractionRequest
+{
+public:
+ InteractionRequest(
+ com::sun::star::uno::Reference<
+ com::sun::star::task::XInteractionRequest > const & rRequest)
+ : m_aRequest( rRequest ) {}
+
+ virtual bool toString( rtl::OUString & rString ) = 0;
+ virtual bool handle( rtl::OUString & rString ) = 0;
+
+private:
+ com::sun::star::uno::Reference<
+ com::sun::star::task::XInteractionRequest > m_aRequest;
+};
+*/
+
#endif // UUI_IAHNDL_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc
index 23e377f4dd..23e377f4dd 100644..100755
--- a/uui/source/ids.hrc
+++ b/uui/source/ids.hrc
diff --git a/uui/source/interactionhandler.cxx b/uui/source/interactionhandler.cxx
index 08bc672418..264367718c 100644
--- a/uui/source/interactionhandler.cxx
+++ b/uui/source/interactionhandler.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -142,3 +143,5 @@ UUIInteractionHandler::createInstance(
0);
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/interactionhandler.hxx b/uui/source/interactionhandler.hxx
index 11c9b45075..508032d043 100644
--- a/uui/source/interactionhandler.hxx
+++ b/uui/source/interactionhandler.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -99,3 +100,5 @@ private:
};
#endif // UUI_INTERACTIONHANDLER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/lockfailed.cxx b/uui/source/lockfailed.cxx
index b5320a1303..109ba5b904 100644
--- a/uui/source/lockfailed.cxx
+++ b/uui/source/lockfailed.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -48,3 +49,4 @@ LockFailedQueryBox::~LockFailedQueryBox()
{
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/lockfailed.hxx b/uui/source/lockfailed.hxx
index 70ba107961..0f96b1554b 100644
--- a/uui/source/lockfailed.hxx
+++ b/uui/source/lockfailed.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,3 +41,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/logindlg.cxx b/uui/source/logindlg.cxx
index efb0b77fea..b7ce1f6827 100755
--- a/uui/source/logindlg.cxx
+++ b/uui/source/logindlg.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,12 +30,8 @@
#include <vcl/msgbox.hxx>
#include "logindlg.hxx"
-#ifndef UUI_LOGINDLG_HRC
#include "logindlg.hrc"
-#endif
-#ifndef UUI_IDS_HRC
#include "ids.hrc"
-#endif
#include <tools/resid.hxx>
#ifdef UNX
@@ -348,3 +345,5 @@ void LoginDialog::ClearAccount()
//............................................................................
//............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/logindlg.hxx b/uui/source/logindlg.hxx
index a349929ce7..170a0be135 100755
--- a/uui/source/logindlg.hxx
+++ b/uui/source/logindlg.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,9 +30,7 @@
#define UUI_LOGINDLG_HXX
#include <svtools/stdctrl.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/dialog.hxx>
#include <vcl/edit.hxx>
#include <vcl/fixed.hxx>
@@ -114,3 +113,4 @@ public:
#endif // UUI_LOGINDLG_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/logindlg.src b/uui/source/logindlg.src
index 822547faf3..822547faf3 100644..100755
--- a/uui/source/logindlg.src
+++ b/uui/source/logindlg.src
diff --git a/uui/source/loginerr.hxx b/uui/source/loginerr.hxx
index 39bbfb7d82..e14b4c03d1 100644
--- a/uui/source/loginerr.hxx
+++ b/uui/source/loginerr.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/uui/source/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx
index b7e70233ce..dc69ed12de 100644
--- a/uui/source/masterpasscrtdlg.cxx
+++ b/uui/source/masterpasscrtdlg.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,15 +26,12 @@
*
************************************************************************/
+#include <sal/macros.h>
#include <svtools/filedlg.hxx>
#include <vcl/msgbox.hxx>
-#ifndef UUI_IDS_HRC
#include <ids.hrc>
-#endif
-#ifndef UUI_MASTERPASSCRTDLG_HRC
#include <masterpasscrtdlg.hrc>
-#endif
#include <masterpasscrtdlg.hxx>
// MasterPasswordCreateDialog---------------------------------------------------
@@ -129,7 +127,7 @@ MasterPasswordCreateDialog::MasterPasswordCreateDialog
aFTMasterPasswordWarning.SetPosSizePixel( aFTMasterPasswordWarning.GetPosPixel(), aNewWarningSize );
Window* pControls[] = { &aFL, &aOKBtn, &aCancelBtn, &aHelpBtn };
- const sal_Int32 nCCount = sizeof( pControls ) / sizeof( pControls[0] );
+ const sal_Int32 nCCount = SAL_N_ELEMENTS( pControls );
for ( int i = 0; i < nCCount; ++i )
{
Point aNewPos =(*pControls[i]).GetPosPixel();
@@ -152,7 +150,7 @@ void MasterPasswordCreateDialog::CalculateTextHeight()
&aFTMasterPasswordRepeat, &aEDMasterPasswordRepeat, &aFTCautionText,
&aFLCautionText, &aOKBtn, &aCancelBtn, &aHelpBtn };
Window** pWindow = pWins;
- const sal_Int32 nCount = sizeof( pWins ) / sizeof( pWins[0] );
+ const sal_Int32 nCount = SAL_N_ELEMENTS( pWins );
for ( sal_Int32 i = 0; i < nCount; ++i, ++pWindow )
{
Point aNewPos = (*pWindow)->GetPosPixel();
@@ -171,7 +169,7 @@ void MasterPasswordCreateDialog::CalculateTextHeight()
nDelta += nTemp;
Window* pWins[] = { &aFLCautionText, &aOKBtn, &aCancelBtn, &aHelpBtn };
Window** pWindow = pWins;
- const sal_Int32 nCount = sizeof( pWins ) / sizeof( pWins[0] );
+ const sal_Int32 nCount = SAL_N_ELEMENTS( pWins );
for ( sal_Int32 i = 0; i < nCount; ++i, ++pWindow )
{
Point aNewPos = (*pWindow)->GetPosPixel();
@@ -188,3 +186,4 @@ void MasterPasswordCreateDialog::CalculateTextHeight()
}
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/masterpasscrtdlg.hxx b/uui/source/masterpasscrtdlg.hxx
index 6c652cbb44..e9e0a98b0c 100644
--- a/uui/source/masterpasscrtdlg.hxx
+++ b/uui/source/masterpasscrtdlg.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,13 +29,9 @@
#ifndef UUI_MASTERPASSCRTDLG_HXX
#define UUI_MASTERPASSCRTDLG_HXX
-#ifndef _COM_SUN_STAR_TASK_PASSWORDREQUESTMODE_HPP
#include <com/sun/star/task/PasswordRequestMode.hpp>
-#endif
#include <svtools/stdctrl.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/dialog.hxx>
#include <vcl/edit.hxx>
#include <vcl/group.hxx>
@@ -78,3 +75,5 @@ private:
};
#endif // UUI_MASTERPASSCRTDLG_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/masterpassworddlg.cxx b/uui/source/masterpassworddlg.cxx
index 898b2eb9fe..163fbe6e23 100644
--- a/uui/source/masterpassworddlg.cxx
+++ b/uui/source/masterpassworddlg.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,12 +29,8 @@
#include <svtools/filedlg.hxx>
#include <vcl/msgbox.hxx>
-#ifndef UUI_IDS_HRC
#include <ids.hrc>
-#endif
-#ifndef UUI_MASTERPASSWORDDLG_HRC
#include <masterpassworddlg.hrc>
-#endif
#include <masterpassworddlg.hxx>
// MasterPasswordDialog---------------------------------------------------
@@ -78,3 +75,4 @@ MasterPasswordDialog::MasterPasswordDialog
aOKBtn.SetClickHdl( LINK( this, MasterPasswordDialog, OKHdl_Impl ) );
};
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/masterpassworddlg.hxx b/uui/source/masterpassworddlg.hxx
index 07753fbd3d..8c4037502b 100644
--- a/uui/source/masterpassworddlg.hxx
+++ b/uui/source/masterpassworddlg.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,13 +29,9 @@
#ifndef UUI_MASTERPASSWORDDLG_HXX
#define UUI_MASTERPASSWORDDLG_HXX
-#ifndef _COM_SUN_STAR_TASK_PASSWORDREQUESTMODE_HPP
#include <com/sun/star/task/PasswordRequestMode.hpp>
-#endif
#include <svtools/stdctrl.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/dialog.hxx>
#include <vcl/edit.hxx>
#include <vcl/group.hxx>
@@ -64,3 +61,4 @@ private:
#endif // UUI_MASTERPASSWORDDLG_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/mphndl.hxx b/uui/source/mphndl.hxx
index 204e2374d1..933a21c595 100644
--- a/uui/source/mphndl.hxx
+++ b/uui/source/mphndl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -94,3 +95,4 @@ public:
#endif // UUI_IAHNDL_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/nameclashdlg.hxx b/uui/source/nameclashdlg.hxx
index 346b1faafd..dc23847c4d 100755
--- a/uui/source/nameclashdlg.hxx
+++ b/uui/source/nameclashdlg.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/uui/source/newerverwarn.cxx b/uui/source/newerverwarn.cxx
index 03c8bd3755..ed860428cf 100644
--- a/uui/source/newerverwarn.cxx
+++ b/uui/source/newerverwarn.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -199,3 +200,4 @@ void NewerVersionWarningDialog::InitButtonWidth()
} // end of namespace uui
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/newerverwarn.hxx b/uui/source/newerverwarn.hxx
index d108bbbfc8..ed8ebac754 100644
--- a/uui/source/newerverwarn.hxx
+++ b/uui/source/newerverwarn.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -59,3 +60,4 @@ namespace uui
#endif // #ifndef _NEWERVERSIONWARNING_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/openlocked.cxx b/uui/source/openlocked.cxx
index 7b6e6a47a5..4734a486d3 100644
--- a/uui/source/openlocked.cxx
+++ b/uui/source/openlocked.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,3 +51,4 @@ OpenLockedQueryBox::~OpenLockedQueryBox()
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/openlocked.hxx b/uui/source/openlocked.hxx
index ddb54713df..259a355553 100644
--- a/uui/source/openlocked.hxx
+++ b/uui/source/openlocked.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,3 +39,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx
index 5c584a559f..5f0b6f368b 100644
--- a/uui/source/passworddlg.cxx
+++ b/uui/source/passworddlg.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/uui/source/passworddlg.hxx b/uui/source/passworddlg.hxx
index 9e959a6aba..c04c9aecca 100644
--- a/uui/source/passworddlg.hxx
+++ b/uui/source/passworddlg.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/uui/source/passworddlg.src b/uui/source/passworddlg.src
index 96c3699370..96c3699370 100644..100755
--- a/uui/source/passworddlg.src
+++ b/uui/source/passworddlg.src
diff --git a/uui/source/passworderrs.src b/uui/source/passworderrs.src
index 249aa1f559..249aa1f559 100644..100755
--- a/uui/source/passworderrs.src
+++ b/uui/source/passworderrs.src
diff --git a/uui/source/requeststringresolver.cxx b/uui/source/requeststringresolver.cxx
index eeed50049c..3fd7bebf2c 100644
--- a/uui/source/requeststringresolver.cxx
+++ b/uui/source/requeststringresolver.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -116,3 +117,5 @@ UUIInteractionRequestStringResolver::createInstance(
0);
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/requeststringresolver.hxx b/uui/source/requeststringresolver.hxx
index 9b52a3f371..6346c7851e 100644
--- a/uui/source/requeststringresolver.hxx
+++ b/uui/source/requeststringresolver.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -88,3 +89,5 @@ private:
};
#endif // UUI_REQUESTSTRINGRESOLVER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx
index 6b62384feb..f17bbf4130 100644
--- a/uui/source/secmacrowarnings.cxx
+++ b/uui/source/secmacrowarnings.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,6 +32,7 @@
#include <comphelper/sequence.hxx>
#include "comphelper/documentconstants.hxx"
#include <comphelper/processfactory.hxx>
+#include <sal/macros.h>
#include <vcl/msgbox.hxx>
#include <com/sun/star/security/NoPasswordException.hpp>
@@ -224,7 +226,7 @@ void MacroWarning::InitControls()
&maBottomSepFL, &maEnableBtn, &maDisableBtn, &maHelpBtn
};
Window** pCurrent = pWins;
- for ( sal_uInt32 i = 0; i < sizeof( pWins ) / sizeof( pWins[ 0 ] ); ++i, ++pCurrent )
+ for ( sal_uInt32 i = 0; i < SAL_N_ELEMENTS( pWins ); ++i, ++pCurrent )
{
Point aNewPos = (*pCurrent)->GetPosPixel();
aNewPos.Y() -= nDelta;
@@ -322,7 +324,7 @@ void MacroWarning::FitControls()
&maDescr2FI, &maAlwaysTrustCB, &maBottomSepFL, &maEnableBtn, &maDisableBtn, &maHelpBtn
};
Window** pCurrent = pWins;
- for ( sal_uInt32 i = 0; i < sizeof( pWins ) / sizeof( pWins[ 0 ] ); ++i, ++pCurrent )
+ for ( sal_uInt32 i = 0; i < SAL_N_ELEMENTS( pWins ); ++i, ++pCurrent )
{
Point aNewPos = (*pCurrent)->GetPosPixel();
aNewPos.Y() -= nDelta;
@@ -376,3 +378,4 @@ void MacroWarning::SetCertificate( const cssu::Reference< css::security::XCertif
}
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx
index 9889d9a363..04bd6f6565 100644
--- a/uui/source/secmacrowarnings.hxx
+++ b/uui/source/secmacrowarnings.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -101,3 +102,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/services.cxx b/uui/source/services.cxx
index 30af064df6..ed0cb55439 100644
--- a/uui/source/services.cxx
+++ b/uui/source/services.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -128,3 +129,5 @@ extern "C" void * SAL_CALL component_getFactory(sal_Char const * pImplName,
return pRet;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/sslwarndlg.cxx b/uui/source/sslwarndlg.cxx
index 95ddef2038..a613d48816 100644
--- a/uui/source/sslwarndlg.cxx
+++ b/uui/source/sslwarndlg.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,15 +28,9 @@
#include <vcl/msgbox.hxx>
-#ifndef UUI_IDS_HRC
#include <ids.hrc>
-#endif
-#ifndef UUI_UNKNOWNAUTHDLG_HRC
#include <sslwarndlg.hrc>
-#endif
-#ifndef UUI_UNKNOWNAUTHDLG_HXX
#include <sslwarndlg.hxx>
-#endif
#include <com/sun/star/security/XDocumentDigitalSignatures.hpp>
@@ -54,7 +49,7 @@ IMPL_LINK( SSLWarnDialog, ViewCertHdl_Impl, PushButton *, EMPTYARG )
uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures > xDocumentDigitalSignatures;
xDocumentDigitalSignatures = uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures >(
- getServiceFactory().get()->createInstance( rtl::OUString::createFromAscii( "com.sun.star.security.DocumentDigitalSignatures" )), uno::UNO_QUERY );
+ getServiceFactory().get()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.security.DocumentDigitalSignatures" ))), uno::UNO_QUERY );
xDocumentDigitalSignatures.get()->showCertificate(getCert());
@@ -91,3 +86,4 @@ SSLWarnDialog::SSLWarnDialog
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/sslwarndlg.hxx b/uui/source/sslwarndlg.hxx
index 4e94cc8855..65326ad14c 100644
--- a/uui/source/sslwarndlg.hxx
+++ b/uui/source/sslwarndlg.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,9 +34,7 @@
#include <vcl/fixed.hxx>
#include <vcl/button.hxx>
#include <com/sun/star/security/XCertificate.hpp>
-#ifndef _COM_SUN_STAR_XML_CRYPTO_XXSECURITYENVIRONMENT_HPP_
#include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp>
-#endif
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
namespace cssu = com::sun::star::uno;
@@ -83,3 +82,4 @@ private:
#endif // UUI_SSLWARN_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/trylater.cxx b/uui/source/trylater.cxx
index 80599081a3..35b65271f4 100644
--- a/uui/source/trylater.cxx
+++ b/uui/source/trylater.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,3 +50,4 @@ TryLaterQueryBox::~TryLaterQueryBox()
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/trylater.hxx b/uui/source/trylater.hxx
index e8040c153e..fd9915261d 100644
--- a/uui/source/trylater.hxx
+++ b/uui/source/trylater.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,3 +39,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx
index e49ba7680c..256693cb1c 100644
--- a/uui/source/unknownauthdlg.cxx
+++ b/uui/source/unknownauthdlg.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,15 +28,9 @@
#include <vcl/msgbox.hxx>
-#ifndef UUI_IDS_HRC
#include <ids.hrc>
-#endif
-#ifndef UUI_UNKNOWNAUTHDLG_HRC
#include <unknownauthdlg.hrc>
-#endif
-#ifndef UUI_UNKNOWNAUTHDLG_HXX
#include <unknownauthdlg.hxx>
-#endif
#include <com/sun/star/security/XDocumentDigitalSignatures.hpp>
@@ -61,7 +56,7 @@ IMPL_LINK( UnknownAuthDialog, ViewCertHdl_Impl, PushButton *, EMPTYARG )
uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures > xDocumentDigitalSignatures;
xDocumentDigitalSignatures = uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures >(
- getServiceFactory().get()->createInstance( rtl::OUString::createFromAscii( "com.sun.star.security.DocumentDigitalSignatures" )), uno::UNO_QUERY );
+ getServiceFactory().get()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.security.DocumentDigitalSignatures" ))), uno::UNO_QUERY );
xDocumentDigitalSignatures.get()->showCertificate(getCert());
@@ -101,3 +96,4 @@ UnknownAuthDialog::UnknownAuthDialog
m_aCommandButtonOK.SetClickHdl( LINK( this, UnknownAuthDialog, OKHdl_Impl ) );
};
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/unknownauthdlg.hxx b/uui/source/unknownauthdlg.hxx
index 0ca6c38fe8..4b15f7d20f 100644
--- a/uui/source/unknownauthdlg.hxx
+++ b/uui/source/unknownauthdlg.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,9 +34,7 @@
#include <vcl/fixed.hxx>
#include <vcl/button.hxx>
#include <com/sun/star/security/XCertificate.hpp>
-#ifndef _COM_SUN_STAR_XML_CRYPTO_XXSECURITYENVIRONMENT_HPP_
#include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp>
-#endif
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
namespace cssu = com::sun::star::uno;
@@ -85,3 +84,5 @@ private:
};
#endif // UUI_UNKNOWNAUTH_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/util/uui.xml b/uui/util/uui.xml
index f193759f2f..d5a2537a53 100644
--- a/uui/util/uui.xml
+++ b/uui/util/uui.xml
@@ -27,7 +27,6 @@
<project-build-dependency>toolkit</project-build-dependency>
<project-build-dependency>tools</project-build-dependency>
<project-build-dependency>vcl</project-build-dependency>
- <project-build-dependency>vos</project-build-dependency>
<runtime-module-dependency>cppu3</runtime-module-dependency>
<runtime-module-dependency>cppuhelper3$(COM)</runtime-module-dependency>
<runtime-module-dependency>sal3</runtime-module-dependency>
diff --git a/vbahelper/source/msforms/makefile.mk b/vbahelper/source/msforms/makefile.mk
deleted file mode 100644
index 4cc065f23c..0000000000
--- a/vbahelper/source/msforms/makefile.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=vbahelper
-TARGET=msforms
-
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.IF "$(ENABLE_VBA)" == "NO"
-dummy:
- @echo "Nothing to build"
-.ENDIF
-
-.INCLUDE : settings.mk
-
-SLOFILES=\
- $(SLO)$/vbacontrol.obj \
- $(SLO)$/vbacontrols.obj \
- $(SLO)$/vbabutton.obj \
- $(SLO)$/vbacombobox.obj \
- $(SLO)$/vbalabel.obj \
- $(SLO)$/vbatextbox.obj \
- $(SLO)$/vbaradiobutton.obj \
- $(SLO)$/vbalistbox.obj \
- $(SLO)$/vbatogglebutton.obj \
- $(SLO)$/vbacheckbox.obj \
- $(SLO)$/vbaframe.obj \
- $(SLO)$/vbascrollbar.obj \
- $(SLO)$/vbaprogressbar.obj \
- $(SLO)$/vbamultipage.obj \
- $(SLO)$/vbalistcontrolhelper.obj \
- $(SLO)$/vbaspinbutton.obj \
- $(SLO)$/vbasystemaxcontrol.obj \
- $(SLO)$/vbaimage.obj \
- $(SLO)$/vbapages.obj \
- $(SLO)$/vbauserform.obj \
- $(SLO)$/service.obj \
-
-# #FIXME vbapropvalue needs to move to vbahelper
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/vbahelper/source/msforms/vbabutton.hxx b/vbahelper/source/msforms/vbabutton.hxx
index e52964f71d..0596c0bd28 100644
--- a/vbahelper/source/msforms/vbabutton.hxx
+++ b/vbahelper/source/msforms/vbabutton.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/vbahelper/source/vbahelper/vbapropvalue.cxx b/vbahelper/source/vbahelper/vbapropvalue.cxx
deleted file mode 100644
index 22c87e9a6d..0000000000
--- a/vbahelper/source/vbahelper/vbapropvalue.cxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#include "vbahelper/vbapropvalue.hxx"
-
-using namespace com::sun::star;
-
-ScVbaPropValue::ScVbaPropValue( PropListener* pListener ) : m_pListener( pListener )
-{
-}
-
-css::uno::Any SAL_CALL
-ScVbaPropValue::getValue() throw (css::uno::RuntimeException)
-{
- return m_pListener->getValueEvent();
-}
-
-void SAL_CALL
-ScVbaPropValue::setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException)
-{
- m_pListener->setValueEvent( _value );
-}