docstyle.cxx (26ea3662) docstyle.cxx (baef7ff7)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 1253 unchanged lines hidden (view full) ---

1262 {
1263 // keine bedingte Vorlage, dann erstmal erzeugen und
1264 // alle wichtigen Werte uebernehmen
1265 SwConditionTxtFmtColl* pCColl = rDoc.MakeCondTxtFmtColl(
1266 pColl->GetName(), (SwTxtFmtColl*)pColl->DerivedFrom() );
1267 if( pColl != &pColl->GetNextTxtFmtColl() )
1268 pCColl->SetNextTxtFmtColl( pColl->GetNextTxtFmtColl() );
1269
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 1253 unchanged lines hidden (view full) ---

1262 {
1263 // keine bedingte Vorlage, dann erstmal erzeugen und
1264 // alle wichtigen Werte uebernehmen
1265 SwConditionTxtFmtColl* pCColl = rDoc.MakeCondTxtFmtColl(
1266 pColl->GetName(), (SwTxtFmtColl*)pColl->DerivedFrom() );
1267 if( pColl != &pColl->GetNextTxtFmtColl() )
1268 pCColl->SetNextTxtFmtColl( pColl->GetNextTxtFmtColl() );
1269
1270 //pCColl->SetOutlineLevel( pColl->GetOutlineLevel() );//#outline level,zhaojianwei
1271 if( pColl->IsAssignedToListLevelOfOutlineStyle())
1272 pCColl->AssignToListLevelOfOutlineStyle(pColl->GetAssignedOutlineStyleLevel());
1273 else
1270 if( pColl->IsAssignedToListLevelOfOutlineStyle())
1271 pCColl->AssignToListLevelOfOutlineStyle(pColl->GetAssignedOutlineStyleLevel());
1272 else
1274 pCColl->DeleteAssignmentToListLevelOfOutlineStyle();//<--end,zhaojianwei
1273 pCColl->DeleteAssignmentToListLevelOfOutlineStyle();
1275
1276
1277
1278 SwTxtFmtColl* pFindFmt;
1279 const CommandStruct* pCmds = SwCondCollItem::GetCmds();
1280 for( sal_uInt16 i = 0; i < COND_COMMAND_COUNT; ++i )
1281 {
1282 const String& rStyle = pCondItem->GetStyle( i );

--- 1693 unchanged lines hidden --- 		1274
1275
1276
1277 SwTxtFmtColl* pFindFmt;
1278 const CommandStruct* pCmds = SwCondCollItem::GetCmds();
1279 for( sal_uInt16 i = 0; i < COND_COMMAND_COUNT; ++i )
1280 {
1281 const String& rStyle = pCondItem->GetStyle( i );

--- 1693 unchanged lines hidden ---