Author: orw
Date: Tue Mar 26 16:11:28 2013
New Revision: 1461200
URL: http://svn.apache.org/r1461200
Log:
#121793# correct license header and further clean-up
Modified:
openoffice/branches/sidebar/main/sw/source/ui/sidebar/PagePropertyPanel.cxx
openoffice/branches/sidebar/main/sw/source/ui/sidebar/PagePropertyPanel.hrc
openoffice/branches/sidebar/main/sw/source/ui/sidebar/PropertyPanel.hrc
Modified:
openoffice/branches/sidebar/main/sw/source/ui/sidebar/PagePropertyPanel.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/source/ui/sidebar/PagePropertyPanel.cxx?rev=1461200&r1=1461199&r2=1461200&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/source/ui/sidebar/PagePropertyPanel.cxx
(original)
+++ openoffice/branches/sidebar/main/sw/source/ui/sidebar/PagePropertyPanel.cxx
Tue Mar 26 16:11:28 2013
@@ -1,11 +1,23 @@
-/************************************************************************
-*
-* Licensed Materials - Property of IBM.
-* (C) Copyright IBM Corporation 2003, 2012. All Rights Reserved.
-* U.S. Government Users Restricted Rights:
-* Use, duplication or disclosure restricted by GSA ADP Schedule Contract with
IBM Corp.
-*
-************************************************************************/
+/**************************************************************
+*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*
+*************************************************************/
#include "precompiled_sw.hxx"
Modified:
openoffice/branches/sidebar/main/sw/source/ui/sidebar/PagePropertyPanel.hrc
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/source/ui/sidebar/PagePropertyPanel.hrc?rev=1461200&r1=1461199&r2=1461200&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/source/ui/sidebar/PagePropertyPanel.hrc
(original)
+++ openoffice/branches/sidebar/main/sw/source/ui/sidebar/PagePropertyPanel.hrc
Tue Mar 26 16:11:28 2013
@@ -19,7 +19,6 @@
*
*************************************************************/
-//#include <sfx2/propertypanel.hrc>
#include "PropertyPanel.hrc"
#define FT_ORIENTATION 1
Modified:
openoffice/branches/sidebar/main/sw/source/ui/sidebar/PropertyPanel.hrc
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/source/ui/sidebar/PropertyPanel.hrc?rev=1461200&r1=1461199&r2=1461200&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/source/ui/sidebar/PropertyPanel.hrc
(original)
+++ openoffice/branches/sidebar/main/sw/source/ui/sidebar/PropertyPanel.hrc Tue
Mar 26 16:11:28 2013
@@ -1,32 +1,37 @@
-/************************************************************************
- *
- * Licensed Materials - Property of IBM.
- * (C) Copyright IBM Corporation 2003, 2012. All Rights Reserved.
- * U.S. Government Users Restricted Rights:
- * Use, duplication or disclosure restricted by GSA ADP Schedule Contract with
IBM Corp.
- *
- ************************************************************************/
+/**************************************************************
+*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*
+*************************************************************/
-//
-
-#ifndef _SW_PROPERTY_SECTION_HRC
-#define _SW_PROPERTY_SECTION_HRC
+#ifndef _SW_PROPERTY_PANEL_HRC
+#define _SW_PROPERTY_PANEL_HRC
#include "rcid.hrc"
-#define RID_PROPERTYPANEL_SWOBJWRAP_PAGE (RC_PROPERTYPANEL_BEGIN + 1)
-//Added
-#define RID_PROPERTYPANEL_SWPAGE
(RC_PROPERTYPANEL_BEGIN + 2)
-#define RID_POPUP_SWPAGE_MARGIN
(RC_PROPERTYPANEL_BEGIN + 3)
-#define RID_POPUP_SWPAGE_ORIENTATION (RC_PROPERTYPANEL_BEGIN + 4)
-#define RID_POPUP_SWPAGE_COLUMN
(RC_PROPERTYPANEL_BEGIN + 5)
-#define RID_POPUP_SWPAGE_SIZE
(RC_PROPERTYPANEL_BEGIN + 6)
-//End of new code
-
-#define RID_STR_PANELDOCK_MODELDESIGN
(RC_PROPERTYPANEL_BEGIN + 1)
-#define RID_STR_PANELDOCK_MEDIAPLAYER
(RC_PROPERTYPANEL_BEGIN + 2)
+#define RID_PROPERTYPANEL_SWOBJWRAP_PAGE (RC_PROPERTYPANEL_BEGIN + 1)
+#define RID_PROPERTYPANEL_SWPAGE (RC_PROPERTYPANEL_BEGIN + 2)
+#define RID_POPUP_SWPAGE_MARGIN (RC_PROPERTYPANEL_BEGIN + 3)
+#define RID_POPUP_SWPAGE_ORIENTATION (RC_PROPERTYPANEL_BEGIN + 4)
+#define RID_POPUP_SWPAGE_COLUMN (RC_PROPERTYPANEL_BEGIN + 5)
+#define RID_POPUP_SWPAGE_SIZE (RC_PROPERTYPANEL_BEGIN + 6)
-#define PROPERTY_SECTION_END RID_IL_PANELDOCK_MENU_SW
+#define PROPERTY_PANEL_END RID_POPUP_SWPAGE_SIZE
#if PROPERTY_SECTION_END > RC_PROPERTYPANEL_END
#error Resource-Id Ueberlauf in #file, #line
