From 63dc7b1ce8a5d4cd8ec63526324736f73f0871c7 Mon Sep 17 00:00:00 2001
From: Thomas Arnhold <thomas@arnhold.org>
Date: Fri, 4 Apr 2014 14:57:36 +0200
Subject: SCROLLABLEFRAME never defined

---
 oox/source/ole/axcontrol.cxx                       | 3 ---
 toolkit/source/awt/scrollabledialog.cxx            | 3 ---
 toolkit/source/awt/vclxtoolkit.cxx                 | 7 -------
 xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx | 3 ---
 xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx | 3 ---
 5 files changed, 19 deletions(-)

diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index a1330ac386c5..5488c93d2180 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -2470,9 +2470,6 @@ void AxFrameModel::convertProperties( PropertyMap& rPropMap, const ControlConver
 {
     rPropMap.setProperty( PROP_Label, maCaption );
     rPropMap.setProperty( PROP_Enabled, getFlag( mnFlags, AX_CONTAINER_ENABLED ) );
-#ifdef SCROLLABLEFRAME
-    rConv.convertScrollabilitySettings( rPropMap, maScrollPos, maLogicalSize, mnScrollBars );
-#endif
     AxContainerModelBase::convertProperties( rPropMap, rConv );
 }
 
diff --git a/toolkit/source/awt/scrollabledialog.cxx b/toolkit/source/awt/scrollabledialog.cxx
index 1d6cab59e368..f776bdc8ed37 100644
--- a/toolkit/source/awt/scrollabledialog.cxx
+++ b/toolkit/source/awt/scrollabledialog.cxx
@@ -177,9 +177,6 @@ void ScrollableWrapper<T>::ResetScrollBars()
 }
 
 template class ScrollableWrapper< Dialog >;
-#ifdef SCROLLABLEFRAME
-template class ScrollableWrapper< GroupBox >;
-#endif
 
 } // toolkit
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 68bc8ffa7fe4..6cc7aee716f6 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -876,13 +876,6 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
             break;
             case WINDOW_GROUPBOX:
                         {
-#ifdef SCROLLABLEFRAME
-                if ( bFrameControl )
-                {
-                    pNewWindow = new toolkit::ScrollableWrapper< GroupBox >( pParent, nWinBits | WB_VSCROLL );
-                }
-                else
-#endif
                     pNewWindow = new GroupBox( pParent, nWinBits );
                                 if ( bFrameControl )
                                 {
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
index 560da0f9ace2..e20fc1757bc6 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
@@ -121,9 +121,6 @@ void ElementDescriptor::readFrameModel( StyleBag * all_styles )
         title->addAttribute( XMLNS_DIALOGS_PREFIX ":value", aTitle );
         addSubElement( title );
     }
-#ifdef SCROLLABLEFRAME
-    readScrollableSettings();
-#endif
     uno::Reference< container::XNameContainer > xControlContainer( _xProps, uno::UNO_QUERY );
     if ( xControlContainer.is() && xControlContainer->getElementNames().getLength() )
     {
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
index a9f2337451b2..214b17e79d08 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
@@ -96,9 +96,6 @@ void Frame::endElement()
     {
         xControlModel->setPropertyValue( "Label" , makeAny( _label ) );
     }
-#ifdef SCROLLABLEFRAME
-    ctx.importScollableSettings( _xAttributes );
-#endif
     ctx.importEvents( _events );
     // avoid ring-reference:
     // vector< event elements > holding event elements holding this (via _pParent)
-- 
cgit