summaryrefslogtreecommitdiffstats
path: root/vcl/source/window
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source/window')
-rw-r--r--vcl/source/window/accel.cxx2
-rw-r--r--vcl/source/window/builder.cxx4
-rw-r--r--vcl/source/window/keycod.cxx3
-rw-r--r--vcl/source/window/layout.cxx6
-rw-r--r--vcl/source/window/menu.cxx2
-rw-r--r--vcl/source/window/printdlg.cxx2
-rw-r--r--vcl/source/window/status.cxx2
-rw-r--r--vcl/source/window/syschild.cxx2
-rw-r--r--vcl/source/window/syswin.cxx2
-rw-r--r--vcl/source/window/tabdlg.cxx2
-rw-r--r--vcl/source/window/toolbox.cxx4
-rw-r--r--vcl/source/window/window2.cxx2
-rw-r--r--vcl/source/window/winproc.cxx10
13 files changed, 23 insertions, 20 deletions
diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx
index 69a556e0ecaa..7ba39842a2af 100644
--- a/vcl/source/window/accel.cxx
+++ b/vcl/source/window/accel.cxx
@@ -37,7 +37,7 @@ public:
ImplAccelList maIdList; // Id-List
};
-sal_uInt16 ImplAccelEntryGetIndex( ImplAccelList* pList, sal_uInt16 nId,
+static sal_uInt16 ImplAccelEntryGetIndex( ImplAccelList* pList, sal_uInt16 nId,
sal_uInt16* pIndex = nullptr )
{
size_t nLow;
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 9b1a1d322916..3bfff31b910e 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -57,7 +57,7 @@
#include <dlfcn.h>
#endif
-bool toBool(const OString &rValue)
+static bool toBool(const OString &rValue)
{
return (!rValue.isEmpty() && (rValue[0] == 't' || rValue[0] == 'T' || rValue[0] == '1'));
}
@@ -3267,7 +3267,7 @@ void VclBuilder::insertMenuObject(PopupMenu *pParent, PopupMenu *pSubMenu, const
/// Insert items to a ComboBox or a ListBox.
/// They have no common ancestor that would have 'InsertEntry()', so use a template.
-template<typename T> bool insertItems(vcl::Window *pWindow, VclBuilder::stringmap &rMap, const std::vector<ComboBoxTextItem> &rItems)
+template<typename T> static bool insertItems(vcl::Window *pWindow, VclBuilder::stringmap &rMap, const std::vector<ComboBoxTextItem> &rItems)
{
T *pContainer = dynamic_cast<T*>(pWindow);
if (!pContainer)
diff --git a/vcl/source/window/keycod.cxx b/vcl/source/window/keycod.cxx
index 5f4d4c441d30..8aeb7b07cb74 100644
--- a/vcl/source/window/keycod.cxx
+++ b/vcl/source/window/keycod.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <accel.h>
#include <salinst.hxx>
#include <salframe.hxx>
#include <svdata.hxx>
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index fd45676424a7..2b4ac9c11b9c 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -183,7 +183,7 @@ void VclContainer::queue_resize(StateChangedType eReason)
}
-Button* isVisibleButtonWithText(vcl::Window* pCandidate)
+static Button* isVisibleButtonWithText(vcl::Window* pCandidate)
{
if (!pCandidate)
return nullptr;
@@ -1234,12 +1234,12 @@ static void calcMaxs(const array_type &A, std::vector<VclGrid::Value> &rWidths,
}
}
-bool compareValues(const VclGrid::Value &i, const VclGrid::Value &j)
+static bool compareValues(const VclGrid::Value &i, const VclGrid::Value &j)
{
return i.m_nValue < j.m_nValue;
}
-VclGrid::Value accumulateValues(const VclGrid::Value &i, const VclGrid::Value &j)
+static VclGrid::Value accumulateValues(const VclGrid::Value &i, const VclGrid::Value &j)
{
VclGrid::Value aRet;
aRet.m_nValue = i.m_nValue + j.m_nValue;
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 1fc1ca4b991f..b92daf20f10c 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -548,7 +548,7 @@ void Menu::RemoveItem( sal_uInt16 nPos )
ImplCallEventListeners( VclEventId::MenuRemoveItem, nPos );
}
-void ImplCopyItem( Menu* pThis, const Menu& rMenu, sal_uInt16 nPos, sal_uInt16 nNewPos )
+static void ImplCopyItem( Menu* pThis, const Menu& rMenu, sal_uInt16 nPos, sal_uInt16 nNewPos )
{
MenuItemType eType = rMenu.GetItemType( nPos );
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 9be367442e21..819b3c7ca6e3 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -883,7 +883,7 @@ bool PrintDialog::isSingleJobs()
return maOptionsPage.mpCollateSingleJobsBox->IsChecked();
}
-void setHelpId( vcl::Window* i_pWindow, const Sequence< OUString >& i_rHelpIds, sal_Int32 i_nIndex )
+static void setHelpId( vcl::Window* i_pWindow, const Sequence< OUString >& i_rHelpIds, sal_Int32 i_nIndex )
{
if( i_nIndex >= 0 && i_nIndex < i_rHelpIds.getLength() )
i_pWindow->SetHelpId( OUStringToOString( i_rHelpIds.getConstArray()[i_nIndex], RTL_TEXTENCODING_UTF8 ) );
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index 666824613b34..86d1c6eadc3e 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -79,7 +79,7 @@ struct ImplStatusItem
std::unique_ptr<SalLayout> mxLayoutCache;
};
-inline long ImplCalcProgressWidth( sal_uInt16 nMax, long nSize )
+static inline long ImplCalcProgressWidth( sal_uInt16 nMax, long nSize )
{
return ((nMax*(nSize+(nSize/2)))-(nSize/2)+(STATUSBAR_PRGS_OFFSET*2));
}
diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx
index b96123ddc637..28063ce19c63 100644
--- a/vcl/source/window/syschild.cxx
+++ b/vcl/source/window/syschild.cxx
@@ -42,7 +42,7 @@
using namespace ::com::sun::star;
-void ImplSysChildProc( void* pInst, SalObjEvent nEvent )
+static void ImplSysChildProc( void* pInst, SalObjEvent nEvent )
{
VclPtr<SystemChildWindow> pWindow = static_cast<SystemChildWindow*>(pInst);
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index 187667e288a7..c5db670b3c6d 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -112,7 +112,7 @@ void SystemWindow::dispose()
Window::dispose();
}
-void ImplHandleControlAccelerator( vcl::Window* pWindow, bool bShow )
+static void ImplHandleControlAccelerator( vcl::Window* pWindow, bool bShow )
{
Control *pControl = dynamic_cast<Control*>(pWindow->ImplGetWindow());
if (pControl && pControl->GetText().indexOf('~') != -1)
diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx
index 1cda73af9e44..9a6c01d2478a 100644
--- a/vcl/source/window/tabdlg.cxx
+++ b/vcl/source/window/tabdlg.cxx
@@ -242,7 +242,7 @@ void TabDialog::StateChanged( StateChangedType nType )
Dialog::StateChanged( nType );
}
-vcl::Window* findTabControl(vcl::Window* pCurrent)
+static vcl::Window* findTabControl(vcl::Window* pCurrent)
{
if (!pCurrent)
{
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index c21499e00d29..66563c6b9ee7 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -145,7 +145,7 @@ int ToolBox::ImplGetDragWidth() const
return ToolBox::ImplGetDragWidth( *this, mbHorz );
}
-ButtonType determineButtonType( ImplToolItem const * pItem, ButtonType defaultType )
+static ButtonType determineButtonType( ImplToolItem const * pItem, ButtonType defaultType )
{
ButtonType tmpButtonType = defaultType;
ToolBoxItemBits nBits = pItem->mnBits & ( ToolBoxItemBits::TEXT_ONLY | ToolBoxItemBits::ICON_ONLY );
@@ -4466,7 +4466,7 @@ bool ToolBox::ImplActivateItem( vcl::KeyCode aKeyCode )
return bRet;
}
-bool ImplCloseLastPopup( vcl::Window const *pParent )
+static bool ImplCloseLastPopup( vcl::Window const *pParent )
{
// close last popup toolbox (see also:
// ImplHandleMouseFloatMode(...) in winproc.cxx )
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index be926265c755..829f7e3f5b27 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -382,7 +382,7 @@ void Window::SetZoom( const Fraction& rZoom )
}
}
-inline long WinFloatRound( double fVal )
+static inline long WinFloatRound( double fVal )
{
return( fVal > 0.0 ? static_cast<long>( fVal + 0.5 ) : -static_cast<long>( -fVal + 0.5 ) );
}
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index ff2d63626b65..590032d10753 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1866,7 +1866,7 @@ static void DelayedCloseEventLink( void* pCEvent, void* )
delete pEv;
}
-void ImplHandleClose( vcl::Window* pWindow )
+static void ImplHandleClose( vcl::Window* pWindow )
{
ImplSVData* pSVData = ImplGetSVData();
@@ -1961,7 +1961,7 @@ static MouseEventModifiers ImplGetMouseButtonMode( SalMouseEvent const * pEvent
return nMode;
}
-inline bool ImplHandleSalMouseLeave( vcl::Window* pWindow, SalMouseEvent const * pEvent )
+static inline bool ImplHandleSalMouseLeave( vcl::Window* pWindow, SalMouseEvent const * pEvent )
{
return ImplHandleMouseEvent( pWindow, MouseNotifyEvent::MOUSEMOVE, true,
pEvent->mnX, pEvent->mnY,
@@ -1969,7 +1969,7 @@ inline bool ImplHandleSalMouseLeave( vcl::Window* pWindow, SalMouseEvent const *
ImplGetMouseMoveMode( pEvent ) );
}
-inline bool ImplHandleSalMouseMove( vcl::Window* pWindow, SalMouseEvent const * pEvent )
+static inline bool ImplHandleSalMouseMove( vcl::Window* pWindow, SalMouseEvent const * pEvent )
{
return ImplHandleMouseEvent( pWindow, MouseNotifyEvent::MOUSEMOVE, false,
pEvent->mnX, pEvent->mnY,
@@ -1977,7 +1977,7 @@ inline bool ImplHandleSalMouseMove( vcl::Window* pWindow, SalMouseEvent const *
ImplGetMouseMoveMode( pEvent ) );
}
-inline bool ImplHandleSalMouseButtonDown( vcl::Window* pWindow, SalMouseEvent const * pEvent )
+static inline bool ImplHandleSalMouseButtonDown( vcl::Window* pWindow, SalMouseEvent const * pEvent )
{
return ImplHandleMouseEvent( pWindow, MouseNotifyEvent::MOUSEBUTTONDOWN, false,
pEvent->mnX, pEvent->mnY,
@@ -1990,7 +1990,7 @@ inline bool ImplHandleSalMouseButtonDown( vcl::Window* pWindow, SalMouseEvent co
ImplGetMouseButtonMode( pEvent ) );
}
-inline bool ImplHandleSalMouseButtonUp( vcl::Window* pWindow, SalMouseEvent const * pEvent )
+static inline bool ImplHandleSalMouseButtonUp( vcl::Window* pWindow, SalMouseEvent const * pEvent )
{
return ImplHandleMouseEvent( pWindow, MouseNotifyEvent::MOUSEBUTTONUP, false,
pEvent->mnX, pEvent->mnY,
generated by cgit (git 2.34.1) at 2024-06-18 15:47:23 +0000