summaryrefslogtreecommitdiff
path: root/framework/source/uielement/menubarwrapper.cxx
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2005-02-16 15:32:12 +0000
committerVladimir Glazounov <vg@openoffice.org>2005-02-16 15:32:12 +0000
commit9b2e118e17032bcd0d91828016a4395af962b60e (patch)
tree6a69b47ba8134df6463a0eeb6a022022a9b5f6b8 /framework/source/uielement/menubarwrapper.cxx
parent315aa430e0b05ebe46610733796047c49e2a6bcf (diff)
INTEGRATION: CWS perform01 (1.4.102); FILE MERGED
2005/02/03 15:14:30 mt 1.4.102.4: fixed wrong solved merge conflict 2005/02/02 15:22:25 mt 1.4.102.3: fixed compile error 2005/02/01 13:31:12 mt 1.4.102.2: RESYNC: (1.4-1.5); FILE MERGED 2005/01/26 10:11:25 cd 1.4.102.1: #i40989# Performance and usability improvements
Diffstat (limited to 'framework/source/uielement/menubarwrapper.cxx')
-rw-r--r--framework/source/uielement/menubarwrapper.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx
index 2012b33dad3e..68557f870ec2 100644
--- a/framework/source/uielement/menubarwrapper.cxx
+++ b/framework/source/uielement/menubarwrapper.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: menubarwrapper.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: kz $ $Date: 2005-01-21 09:51:50 $
+ * last change: $Author: vg $ $Date: 2005-02-16 16:32:12 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -329,3 +329,4 @@ Reference< XInterface > SAL_CALL MenuBarWrapper::getRealInterface() throw ( Runt
}
} // namespace framework
+