summaryrefslogtreecommitdiff
path: root/vcl/win/source/window
diff options
context:
space:
mode:
authorFrank Schoenheit [fs] <frank.schoenheit@oracle.com>2010-12-02 12:00:43 +0100
committerFrank Schoenheit [fs] <frank.schoenheit@oracle.com>2010-12-02 12:00:43 +0100
commitcda10a2d67d77b74cafb41c5ce294c2fd195dc66 (patch)
tree002c9e55808000786b31f67f329baf7d02545c8d /vcl/win/source/window
parent0fbdce7fd45d8e11e7b5482d79dd3f53899d7be3 (diff)
parent8dc3743ca56382374183bec5cd1a11d53f3085b8 (diff)
Automated merge with ssh://hg.services.openoffice.org/cws/gridcontrol07
Diffstat (limited to 'vcl/win/source/window')
-rwxr-xr-x[-rw-r--r--]vcl/win/source/window/salmenu.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/win/source/window/salmenu.cxx b/vcl/win/source/window/salmenu.cxx
index 1eb75969ea38..47da911b012e 100644..100755
--- a/vcl/win/source/window/salmenu.cxx
+++ b/vcl/win/source/window/salmenu.cxx
@@ -59,7 +59,7 @@ BOOL SalData::IsKnownMenuHandle( HMENU hMenu )
// WinSalInst factory methods
-SalMenu* WinSalInstance::CreateMenu( BOOL bMenuBar )
+SalMenu* WinSalInstance::CreateMenu( BOOL bMenuBar, Menu* )
{
WinSalMenu *pSalMenu = new WinSalMenu();