summaryrefslogtreecommitdiffstats
path: root/framework/inc/interaction
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2009-09-18 10:15:03 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2009-09-18 10:15:03 +0000
commitc7e172b2d9036c788fe00552ded841340d115033 (patch)
tree314db633a1a15d67bc0616d1f91f1c49baac6ebc /framework/inc/interaction
parent#i10000#: files added (and removed) missing from integration of CWS kso32fixes2 (diff)
downloadcore-c7e172b2d9036c788fe00552ded841340d115033.tar.gz
core-c7e172b2d9036c788fe00552ded841340d115033.zip
CWS-TOOLING: integrate CWS mba32issues02
2009-09-17 mb93783 merge commit 2009-09-03 tb121644 #i104748 - slot unification to .uno:PasteSpecial 2009-09-01 mba #101455#: code simplification 2009-08-31 mb93783 iso locales for norwegian builds are nb and nn, not no 2009-08-25 mba merge to m55 2009-07-29 mba cleanup after rebase 2009-07-29 mba #i103200#: wrong order of first and last name in CJK UI 2009-07-27 mba adding dictionary changes from broken svn CWS 2009-07-27 mba adding dictionary changes from broken svn CWS 2009-07-27 mba apply patch from broken svn CWS
Diffstat (limited to 'framework/inc/interaction')
-rw-r--r--framework/inc/interaction/quietinteraction.hxx (renamed from framework/inc/interaction/stillinteraction.hxx)8
1 files changed, 4 insertions, 4 deletions
diff --git a/framework/inc/interaction/stillinteraction.hxx b/framework/inc/interaction/quietinteraction.hxx
index d77ebe462043..d45d1b97580e 100644
--- a/framework/inc/interaction/stillinteraction.hxx
+++ b/framework/inc/interaction/quietinteraction.hxx
@@ -28,8 +28,8 @@
*
************************************************************************/
-#ifndef __FRAMEWORK_INTERACTION_STILLINTERACTION_HXX_
-#define __FRAMEWORK_INTERACTION_STILLINTERACTION_HXX_
+#ifndef __FRAMEWORK_INTERACTION_QUIETINTERACTION_HXX_
+#define __FRAMEWORK_INTERACTION_QUIETINTERACTION_HXX_
//_________________________________________________________________________________________________________________
// my own includes
@@ -80,7 +80,7 @@ namespace framework{
@modified 12.07.2002 14:06
@by Andreas Schlüns
*/
-class StillInteraction : public css::lang::XTypeProvider
+class QuietInteraction : public css::lang::XTypeProvider
, public css::task::XInteractionHandler
, private ThreadHelpBase
, public ::cppu::OWeakObject
@@ -130,7 +130,7 @@ class StillInteraction : public css::lang::XTypeProvider
@threadsafe not neccessary
*/
- StillInteraction();
+ QuietInteraction();
//_________________________________
/**