3 files changed, 6 insertions, 57 deletions
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index e5bf08cf0300..407d9ff1ec1e 100755
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -37,8 +37,11 @@
 #include <panelmanager.hxx>
 #include <threadhelp/resetableguard.hxx>
 #include <services.h>
-#include <classes/sfxhelperfunctions.hxx>
+
+#include <framework/sfxhelperfunctions.hxx>
+#include <framework/sfxhelperfunctions.hxx>
 #include <uielement/menubarwrapper.hxx>
+#include <framework/addonsoptions.hxx>
 #include <uiconfiguration/windowstateconfiguration.hxx>
 #include <classes/fwkresid.hxx>
 #include <classes/resource.hrc>
@@ -519,7 +522,7 @@ sal_Bool LayoutManager::implts_readWindowStateData( const rtl::OUString& aName,
         try
         {
             Sequence< PropertyValue > aWindowState;
-            if ( xPersistentWindowState->getByName( aName ) >>= aWindowState )
+            if ( xPersistentWindowState->hasByName( aName ) && (xPersistentWindowState->getByName( aName ) >>= aWindowState) )
             {
                 sal_Bool bValue( sal_False );
                 for ( sal_Int32 n = 0; n < aWindowState.getLength(); n++ )
diff --git a/framework/source/layoutmanager/makefile.mk b/framework/source/layoutmanager/makefile.mk
deleted file mode 100644
index 7ce19a71f2f9..000000000000
--- a/framework/source/layoutmanager/makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.5 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=			framework
-TARGET=				fwk_layout
-USE_DEFFILE=		TRUE
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  		settings.mk
-
-# --- Generate -----------------------------------------------------
-
-SLOFILES=			\
-                    $(SLO)$/panelmanager.obj	\
-                    $(SLO)$/layoutmanager.obj	\
-                    $(SLO)$/panel.obj			\
-                    $(SLO)$/helpers.obj			\
-                    $(SLO)$/uielement.obj		\
-                    $(SLO)$/toolbarlayoutmanager.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :			target.mk
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
index baf6f088cc2e..df6b36020f93 100755
--- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
@@ -52,7 +52,7 @@
 #include <stdtypes.h>
 #include <uiconfiguration/globalsettings.hxx>
 #include <uiconfiguration/windowstateconfiguration.hxx>
-#include <classes/addonsoptions.hxx>
+#include <framework/addonsoptions.hxx>
 #include <uielement/uielement.hxx>
 #include <helper/ilayoutnotifications.hxx>